cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-30 19:24:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,946 Commits 11 Branches 0 Tags
fab4ecff1d56bc34b6a71ba767fa943ebbc8f8ab
Commit Graph

8353 Commits

Author SHA1 Message Date
Atermonera
e050f4c789 Merge pull request #5496 from Anewbe/supermatter_grenade 
Ports the supermatter grenade, supporting code
 2018-08-15 21:17:26 -07:00
Atermonera
323b35fc84 Merge pull request #5493 from Anewbe/largecrate_tweak 
Cleans up some largecrate code
 2018-08-15 21:11:47 -07:00
Anewbe
eebb627f00 Partially ports the GLOB system 2018-08-14 18:14:09 -05:00
Mewchild
d01488a1cd Reverts Syringe infections 2018-08-13 10:53:02 -05:00
Anewbe
2eafa13c96 Merge pull request #5494 from Neerti/weather_refactor 
Refactors Weather
 2018-08-12 19:39:18 -05:00
Anewbe
8f42127837 Ports the supermatter grenade, supporting code 2018-08-11 20:10:05 -05:00
Neerti
3b5874d3f1 Weather refactor. 2018-08-11 18:42:36 -04:00
Anewbe
20602a1818 Cleans up some largecrate code 2018-08-10 21:20:15 -05:00
Anewbe
64562eddba FBPs can have brute damage repaired externally again 2018-08-10 17:06:39 -05:00
Atermonera
7d288746ad Merge pull request #5486 from Mechoid/RisingBills 
The Major Bill's shuttle is actually contagious now. Gibs are spaced.
 2018-08-08 20:40:04 -07:00
Atermonera
23c1faac33 Merge pull request #5483 from MisterLayne/inflatable_fix 
Inflatables are damaged properly
 2018-08-08 20:39:23 -07:00
Atermonera
bb575f0d53 Merge pull request #5468 from Anewbe/is_tool 
Hopefully Unnoticeable Tool Refactor
 2018-08-07 22:06:20 -07:00
Mechoid
493d7fcaa7 The Major Bill's shuttle is actually contagious now. 2018-08-07 21:08:03 -07:00
MisterLayne
c6982155bf Become thwarted, thot. 2018-08-07 14:05:48 -04:00
Hawk_v3
ca1b44cf5e Fix for latest Beta 
Allows it to compile, no actual changes.
 2018-08-07 14:16:01 +01:00
Atermonera
0158deba43 Merge pull request #5479 from Anewbe/falling 
I don't know how we keep breaking falling
 2018-08-06 15:42:24 -07:00
Atermonera
7dd5fb7854 Merge pull request #5475 from Anewbe/clusterbang 
Fixes the clusterbang grenade
 2018-08-06 15:40:48 -07:00
Anewbe
eba2257195 Corrects noted issues 2018-08-06 13:15:18 -05:00
Neerti
03ed77b341 Merge pull request #5470 from Anewbe/corgi_rune 
Corgi rune now summons the corgi in a flash of harmless lightning
 2018-08-05 23:03:26 -04:00
Anewbe
d51828e88d I don't know how we keep breaking falling 2018-08-05 16:08:18 -05:00
RadiantFlash7
723c3d63be Mapping work+lumber lockers 
Added some structures DMI's to use, adjusted mining+part of xenoarch,
did a lot of work on lower level and maint level, added a few closet
variants for lumberjacks
 2018-08-05 13:21:22 -04:00
Anewbe
a7ffa471b7 Fixes the clusterbang grenade 2018-08-05 01:13:16 -05:00
KasparoVy
073750516f VORE Edit to Fix Hiding with Taur Buckling 
Was broken when taur riding was enabled and required some tweaks.
Took the chance to add a few extra features & fluff up hiding a bit.
If you're grabbed, grab someone, buckle yourself or are buckled by someone else you now become un-hidden. You cannot hide yourself while grabbed or buckled.
There are a few fluff messages for these circumstances but otherwise hiding behaves exactly as it used to.
 2018-08-04 21:13:05 -04:00
KasparoVy
e86fddfe07 Hiding Fluff 
Revealing a hidden mob is now its own proc. You can pass special fluff messages to mobs with this when they are revealed.
Now a mob is revealed when they die, are grabbed/grab something and when they buckle to something.
 2018-08-04 21:11:03 -04:00
Anewbe
f1507ebfa2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool 2018-08-04 11:20:02 -05:00
Neerti
6ffd299fd7 Merge pull request #5461 from Atermonera/supply_nanoUI 
Refactors supply controller
 2018-08-04 02:55:15 -04:00
Anewbe
ef131135f0 Corgi rune now summons the corgi in a flash of harmless lightning 2018-08-03 16:58:42 -05:00
Anewbe
c2794c571d Hopefully fixes some tool-conversion things 2018-08-03 15:13:29 -05:00
Zap-zapper
4bed6248b5 Sleevemate tweak. Now can load minds from soulcatchers, and into bodies without mind. 2018-08-03 23:14:37 +07:00
Anewbe
7f84aeab9f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool 2018-08-02 22:35:14 -05:00
Anewbe
729ce71aa0 Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format 2018-08-02 21:45:15 -05:00
Anewbe
c86b1ac5c3 Merge pull request #5459 from Neerti/storm_enhancements 
Makes Storms Thunderous
 2018-08-01 15:52:12 -05:00
Atermonera
386bea3c38 Merge pull request #5456 from Mechoid/Fix_Gigaphones 
Fix telepathic gigaphones.
 2018-08-01 09:00:19 -07:00
atermonera
ef6c5abf15 Refactors supply controller. 
Supply consoles now run nanoUI
 2018-07-31 19:11:02 -07:00
Neerti
6bdf355e6d Finishes thunderstorms. 2018-07-31 14:45:26 -04:00
Atermonera
c7caff2b3e Added Squid plushies of varying colours 2018-07-30 16:02:42 -04:00
Mechoid
0f56e2453a Mechoid makes mistakes. Fix telepathic gigaphones. 2018-07-30 12:58:41 -07:00
Baguette
01dafff251 Added hat functionality to Squid plushies 
I added the ability to wear my Squid plushies as hats. They're damn good hats.
 2018-07-29 22:44:25 +01:00
Baguette
b7f7580d4b Added Squid plushies of varying colours 
I added a few Squid plushies in different colours, changing the files code/game/objects/items/toys.dm
and obj/toy.dmi
 2018-07-29 19:37:18 +01:00
Neerti
8639d49c34 Begins work on lightning. 2018-07-28 11:08:30 -04:00
Anewbe
6c6c5a2255 Merge pull request #5444 from Mechoid/Gigglephone 
Adds the Gigaphone, a suped-up Megaphone.
 2018-07-27 19:28:36 -04:00
Anewbe
839fb2a33e Merge pull request #5444 from Mechoid/Gigglephone 
Adds the Gigaphone, a suped-up Megaphone.
 2018-07-27 18:27:57 -05:00
Neerti
8faa8c5c9c Fireaxe cabinets find their fireaxes in initialize(), rather than new() 2018-07-27 02:16:58 -04:00
Anewbe
bca0350348 Fireaxe cabinets find their fireaxes in initialize(), rather than new() 2018-07-26 22:42:36 -05:00
Anewbe
975b5a7bf2 Merge pull request #5441 from Mechoid/Halogenscannerreeee 
Fixes the PDA Halogen Scanner's tendency to be number one.
 2018-07-26 15:14:18 -04:00
Mechoid
95f7a46979 Adds the Gigaphone, a suped-up Megaphone. 2018-07-26 00:13:11 -07:00
Mechoid
1e5a0750f9 Fixes the PDA Halogen Scanner's tendency to be number one. 2018-07-25 17:04:41 -07:00
Anewbe
0abdfff854 Merge pull request #5439 from Neerti/layer_fixes 
Fixes layering issues for a few things
 2018-07-25 17:27:05 -04:00
Neerti
066975bad0 Fixes some layering issues with trees, outdoor turf edges, and the targeting indicator. 2018-07-24 13:30:09 -04:00
Anewbe
f5312bcedd Refactors supply controller 2018-07-24 11:04:16 -04:00