cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 22:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,738 Commits 7 Branches 0 Tags
e4a1034c03fbf511066bab9b7e94e4d57cbed6cb
Commit Graph

22936 Commits

Author SHA1 Message Date
Anewbe
02e1db9dfd Merge pull request #6261 from Heroman3003/botanfix 
Fixes atmosphere targeted mutation editing wrong plant traits
 2019-07-03 13:09:46 -04:00
Anewbe
e223a8b4ad Merge pull request #6251 from Heroman3003/reactionfix 
Fixes retaliate mobs ignoring melee attacks
 2019-07-02 08:28:01 -04:00
Heroman
96ff9f43b9 And to exploration vendor too 2019-07-02 12:10:50 +10:00
Heroman
d0b9ab620a Adds mining GPS to mining vendor 2019-07-02 12:08:05 +10:00
Novacat
1fd999075c Merge pull request #5408 from VOREStation/upstream-merge-6249 
[MIRROR] Makes lead icon display stack
 2019-07-01 21:09:51 -04:00
Novacat
e320d73188 Merge pull request #5407 from VOREStation/upstream-merge-6250 
[MIRROR] Allows to interact with turf itself in Turf tab
 2019-07-01 21:09:43 -04:00
Novacat
cf9986a2f2 Merge pull request #5406 from VOREStation/upstream-merge-6248 
[MIRROR] Adds more GPS variety
 2019-07-01 21:09:34 -04:00
Novacat
a56eb4e514 Merge pull request #5405 from VOREStation/upstream-merge-6247 
[MIRROR] Fixes runtime and GPS problem with invalid Z-levels
 2019-07-01 21:09:26 -04:00
Atermonera
9d207a28fd Merge pull request #6249 from Heroman3003/lead-stack 
Makes lead icon display stack
 2019-07-01 20:48:45 -04:00
Atermonera
02ea14d239 Merge pull request #6250 from Heroman3003/altclickup 
Allows to interact with turf itself in Turf tab
 2019-07-01 20:48:36 -04:00
Atermonera
4f601a94b8 Merge pull request #6248 from Heroman3003/gpsing 
Adds more GPS variety
 2019-07-01 20:47:22 -04:00
Atermonera
58c2b2311e Merge pull request #6247 from mistyLuminescence/zruntime 
Fixes runtime and GPS problem with invalid Z-levels
 2019-07-01 20:46:10 -04:00
Atermonera
3d31a77514 Multi-Tile Objects, Multi-Tile Hovershuttle 2019-07-01 20:43:53 -04:00
Anewbe
b820ac6844 Merge pull request #6246 from Heroman3003/lightfix 
Fixes construction of lights
 2019-06-30 19:40:15 -04:00
mistyLuminescence
c406672c26 Adds two new Cargo crates! 2019-06-29 19:46:41 -04:00
Anewbe
d731589ba0 Merge pull request #6238 from Heroman3003/broken-components 
QoL improvements for broken components
 2019-06-29 04:08:30 -04:00
Novacat
fb7b809aba Merge pull request #5390 from VOREStation/upstream-merge-6230 
[MIRROR] Adds two new alternate sprites for the detective's revolver.
 2019-06-28 21:41:25 -04:00
Novacat
0520590462 Merge pull request #5387 from VOREStation/upstream-merge-6235 
[MIRROR] Adds Material Scanner to Protolathe
 2019-06-28 21:39:48 -04:00
ElectricB1ue
d9ebf54db0 Adds two new alternate sprites for the detective's revolver. (#6230) 
* Adds the sprites

* This should do things.
 2019-06-28 21:23:42 -04:00
Andrew
586ad2906e Adds Material Scanner to Protolathe (#6235) 
* Adds Material Scanner to Protolathe

Adds the optical material scanner to the protolathe (the ones miners get).
Costs 50 steel and 50 glass (same as all the other HUDs)
Required tech is 3 magnet and 3 engineering (same as on the HUD)

Also adjusts the meson design so it actually uses its parent code like the other HUDs

* Changes sorting string
 2019-06-28 21:22:09 -04:00
Atermonera
bbb3201dc2 Merge pull request #6234 from Cerebulon/newsJune19 
Feb-June News Update
 2019-06-28 20:12:47 -04:00
Anewbe
046f481825 Merge pull request #6231 from Heroman3003/ghostjumpfix 
Fixes ghost jump-to-mob
 2019-06-28 10:06:57 -04:00
Unknown
52c1d3a491 Minor Fixes 
- Fixes problems with Alraune Breathing
- Cleans up Subspace Radio code
 2019-06-26 22:38:54 -04:00
if there were two guys on the moon
bf3366c673 Vorestation edit 2019-06-26 19:24:31 +01:00
if there were two guys on the moon
e2b4317366 Custom Say Verbs 2019-06-26 18:52:36 +01:00
Heroman
3789ab51b7 Fixes icon scaling on later byond versions 2019-06-26 15:45:43 +10:00
Heroman
3bc811dbc2 Returns solargrub stun 2019-06-25 15:04:43 +10:00
Unknown
9b4ad70da6 Enables Language Implants 
On request from Dragor.

Removes the VOREStation edits commenting out EAL/Skrellian language implants.
 2019-06-24 21:39:23 -04:00
Novacat
80fc64ef72 Merge pull request #5364 from VOREStation/upstream-merge-5842 
[MIRROR] Blindly adds partial cross-language intelligibility
 2019-06-24 16:19:52 -04:00
Novacat
960df85343 Update generic.dm 2019-06-24 16:11:46 -04:00
Atermonera
9a994e4e16 Merge pull request #6226 from SubberTheFabulous/MonitorFix 
Makes some alt. roboheads actually use their monitors
 2019-06-24 15:24:23 -04:00
Atermonera
2064228917 Blindly adds partial cross-language intelligibility 2019-06-24 15:22:06 -04:00
TheFurryFeline
a47705c293 Indigestible Collar Unprintable 
Copy-pasta fix to prevent printing the new collar in the autolathe because it's a child of the original holocollar. Minor oversight, this one was....
 2019-06-22 18:55:36 -04:00
Wickedtemp
1a01bd076f Update mechfab_designs.dm 2019-06-22 00:03:59 -05:00
Wickedtemp
82422d9a75 Update circuits.dm 2019-06-22 00:02:58 -05:00
Anewbe
7b724d59d5 Merge pull request #6224 from MagmaRam/IC_input_fix 
Fix for some electronics buttons having the wrong label on their pulses.
 2019-06-21 18:26:35 -04:00
Unknown
81732c03f6 Updates Ascian's Kitten 2019-06-21 17:50:11 -04:00
Novacat
c05d335d88 Update cat.dm 2019-06-21 17:40:35 -04:00
Novacat
a9db5212d2 Update cat.dm 2019-06-21 17:33:51 -04:00
mistyLuminescence
711e807d32 tinytweaks 2019-06-21 17:07:51 -04:00
Novacat
1551077cf8 Merge pull request #5354 from VOREStation/upstream-merge-6219 
[MIRROR] Tweaks the NewTM event system further
 2019-06-21 16:43:41 -04:00
Novacat
6ebbb6935e Update planet_weather_change.dm 2019-06-21 15:13:01 -04:00
Wickedtemp
3e76dff71c Merge pull request #1 from Wickedtemp/Wickedtemp-patch-1 
Update mechfab_designs.dm
 2019-06-21 02:40:54 -05:00
Wickedtemp
328c88f175 Update circuits.dm 2019-06-21 02:40:38 -05:00
Wickedtemp
65c38bd9e6 Update mechfab_designs.dm 2019-06-21 02:38:46 -05:00
Novacat
2338bccb57 Update planet_weather_change.dm 2019-06-21 01:34:12 -04:00
Novacat
6c3134b63d Update planet_weather_change.dm 2019-06-21 00:16:51 -04:00
mistyLuminescence
e50b9d0cc0 Serenity (#6208) 
* Serenity

* travis

* adminspawn

* I greatly appreciate all detailed and informative feedback provided. Per request, the Serenity is currently adminspawn-only; a new PR will be made in two weeks to add it to Robotics and resolve any issues encountered during the testing period.

* Comments out circuit for two-week testing period
 2019-06-21 00:14:05 -04:00
Unknown
cb3b4c9ae8 Changes weather 
I... really do not like how this is setup.
 2019-06-19 23:47:44 -04:00
Anewbe
d017075732 Merge pull request #6219 from Mechoid/Event_Retweakening 
Tweaks the NewTM event system further
 2019-06-19 23:34:26 -04:00