cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,252 Commits 5 Branches 0 Tags
fed4b51b3970aec079bca4af101616124f838521
Commit Graph

32762 Commits

Author SHA1 Message Date
Arokha Sieyes
fed4b51b39 Dumb typo on protean messages 2018-09-28 23:11:57 -04:00
Neerti
50decef580 Merge pull request #5576 from Anewbe/dermal_implant_fix 
Dermal implant doesn't cover hair
 2018-09-19 16:08:37 -04:00
Spades
cccad0f12e Merge pull request #4124 from VOREStation/upstream-merge-5465 
[MIRROR] Removes supermatters from cave PoIs.
 2018-09-17 14:12:25 -04:00
Spades
c29cea0e9f Merge pull request #4123 from Zap-zapper/sleevemate 
[FEATURE]Sleevemate new functions
 2018-09-17 14:12:07 -04:00
Spades
b59fd4b551 Merge pull request #4122 from VOREStation/upstream-merge-5464 
[MIRROR] Makes arcing projectiles exist in the code.
 2018-09-17 14:11:46 -04:00
Spades
2480396c02 Merge pull request #4120 from VOREStation/upstream-merge-5460 
[MIRROR] APC Sprite Change
 2018-09-17 14:06:42 -04:00
Spades
089655639b Merge pull request #4114 from VOREStation/upstream-merge-5458 
[MIRROR] Let beams be shown in the Type var selection in View Variables.
 2018-09-17 14:05:30 -04:00
Spades
22acaf3fcd Merge pull request #4092 from VOREStation/upstream-merge-5443 
[MIRROR] Two pAI fixes
 2018-09-10 12:32:59 -04:00
Spades
c5772cf6a0 Update pai.dm 2018-09-10 07:04:03 -04:00
Spades
e51a5f18b5 Update pai.dm 2018-09-10 07:03:30 -04:00
Spades
1eaa3266ba Merge pull request #4088 from VOREStation/upstream-merge-5446 
[MIRROR] Fireaxe cabinets find their fireaxes in initialize(), rather than new()
 2018-09-10 07:02:36 -04:00
Spades
50c0c7bedf Merge branch 'master' into upstream-merge-5446 2018-09-09 17:58:23 -04:00
Spades
eb94467f39 Merge branch 'master' into upstream-merge-5432 2018-09-09 17:57:31 -04:00
Spades
4135792153 Merge pull request #3941 from Verkister/botmount 
Adds dogborg riding.
 2018-09-09 17:56:13 -04:00
Spades
39dff7d319 Merge pull request #4060 from VOREStation/upstream-merge-5421 
[MIRROR] Mining turfs maybe probably possibly look nice all the time now I hope?
 2018-09-09 17:55:52 -04:00
Heroman3003
ae6c668a9d re-added Shellguard Noble sprites (by Travelling Merchant) 2018-09-08 21:24:10 +10:00
Spades
07c2e9c763 Merge pull request #4225 from VOREStation/upstream-merge-5514 
[MIRROR] Removes Shellguard Noble cyborg sprites.
 2018-09-08 06:41:09 -04:00
Spades
26a227b342 Merge pull request #4065 from VOREStation/upstream-merge-5427 
[MIRROR] Fixes the fireaxe cabinet
 2018-09-07 10:50:27 -04:00
Atermonera
7c519f44ed Merge pull request #5514 from TravellingMerchant/master 
Removes Shellguard Noble cyborg sprites.
 2018-09-06 20:52:54 -04:00
Spades
8b7fbbe98c Merge branch 'master' into upstream-merge-5424 2018-09-01 18:40:37 -04:00
Spades
a60d61f594 Update planets.dm 2018-09-01 18:39:06 -04:00
Spades
9e77d6a16f Update floor_attackby.dm 2018-09-01 18:38:23 -04:00
Spades
301ef7cc55 Update wall_attacks.dm 2018-09-01 18:37:55 -04:00
Spades
07a8c29bcd Just update the whole file 2018-09-01 18:37:30 -04:00
Spades
815ccfe308 Update turf_changing.dm 
How the fuck did this get merged here
 2018-09-01 18:36:33 -04:00
Spades
af3df2f511 Merge pull request #4110 from VOREStation/upstream-merge-5455 
[MIRROR] Added Squid plushies of varying colours
 2018-09-01 18:25:21 -04:00
Spades
f4f532693e Merge pull request #4100 from VOREStation/upstream-merge-5449 
[MIRROR] Speeds up alcohol ingested effects
 2018-09-01 17:31:35 -04:00
Spades
7b86d2ba4f Merge pull request #4099 from VOREStation/upstream-merge-5450 
[MIRROR] Fixed mining cloak not being in loadouts
 2018-09-01 17:31:06 -04:00
Spades
35f3e81ca3 Merge pull request #3940 from Verkister/buttmount 
Reworks taur riding system.
 2018-09-01 17:25:23 -04:00
Zap-zapper
b0a0a1e276 Protection from impersonation. Updated to 3700 2018-08-22 17:47:11 +07:00
Spades
64484a6591 Merge pull request #4095 from VOREStation/upstream-merge-5442 
[MIRROR] Admin Supermatter Setup now closes the monitoring room shutters
 2018-08-21 05:41:49 -04:00
Zap-zapper
02b58fdb99 Ghosts which joined soulcatcher can't be downloaded in Sleevemate 2018-08-20 23:45:17 +07:00
Spades
1e38ff859b Merge pull request #4080 from Verkister/honkery 
Couple clown tweaks.
 2018-08-20 08:07:07 -04:00
Spades
a8f8631cfe Merge pull request #4108 from VOREStation/upstream-merge-5453 
[MIRROR] Replaces Skrell namegen
 2018-08-20 08:06:37 -04:00
Spades
1893340d6e Merge pull request #4180 from VOREStation/upstream-merge-5507 
[MIRROR] Fixes incorrect ETA in crew transfer announcement
 2018-08-20 08:06:02 -04:00
Spades
eee6cc7337 Merge pull request #4107 from Eearslya/patch-1 
Fix minor typo in vore attempt warning
 2018-08-20 08:01:09 -04:00
Anewbe
6ef5940260 Merge pull request #5507 from Verkister/patch-14 
Fixes incorrect ETA in crew transfer announcement
 2018-08-19 00:05:49 -04:00
Verkister
25487e6094 edit comments 2018-08-18 12:20:27 +03:00
Spades
16f5ea792b Merge pull request #4091 from VOREStation/upstream-merge-5444 
[MIRROR] Adds the Gigaphone, a suped-up Megaphone.
 2018-08-17 16:13:10 -04:00
Spades
1e27743718 Merge pull request #4087 from VOREStation/upstream-merge-5445 
[MIRROR] Constant Chip has a sprite
 2018-08-17 16:12:57 -04:00
Spades
c1c7af946b Merge pull request #4084 from VOREStation/upstream-merge-5441 
[MIRROR] Fixes the PDA Halogen Scanner's tendency to be number one.
 2018-08-17 16:12:24 -04:00
Spades
887899f50b Merge pull request #4082 from VOREStation/upstream-merge-5439 
[MIRROR] Fixes layering issues for a few things
 2018-08-17 16:12:12 -04:00
Spades
4ab6d7c983 Merge pull request #4081 from VOREStation/upstream-merge-5438 
[MIRROR] AOOC for team traitor
 2018-08-17 16:11:55 -04:00
Spades
e6f2a72d92 Merge pull request #4075 from VOREStation/upstream-merge-5433 
[MIRROR] Limits fire_stacks on mobs by temperature
 2018-08-17 16:11:40 -04:00
Spades
4c001b1e2a Merge pull request #4072 from VOREStation/upstream-merge-5431 
[MIRROR] Fixes RCD runtime
 2018-08-17 16:11:19 -04:00
Spades
69c0cd8b8c Merge pull request #3983 from Verkister/synthmarking 
Couple VS compatibility tweaks on the synthlimb markings option.
 2018-08-17 16:09:56 -04:00
Spades
7f9d5f0fb7 Merge pull request #4175 from VOREStation/upstream-merge-5503 
[MIRROR] (HOPEFULLY) fixes advanced who highlighting the fake ckeys of stealth admins
 2018-08-17 16:09:26 -04:00
Spades
f4a28a179c Merge pull request #4069 from VOREStation/upstream-merge-5430 
[MIRROR] Fixes a few on-mob gun sprites
 2018-08-17 16:07:50 -04:00
Spades
6f35a33e1c Merge pull request #4068 from VOREStation/upstream-merge-5429 
[MIRROR] Adds Marking Order Changing at Character Creation
 2018-08-17 16:07:33 -04:00
Spades
6a95420bf9 Merge pull request #4064 from VOREStation/upstream-merge-5426 
[MIRROR] Fixes a few bugs associated with the Dead Ringer
 2018-08-17 16:07:16 -04:00