cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-21 14:53:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,058 Commits 9 Branches 0 Tags
b4a1e1613232c9940d30d7fafdfeca31472cede2
Commit Graph

6443 Commits

Author SHA1 Message Date
Neerti
b4a1e16132 Merge pull request #4027 from Anewbe/landmark_fixes 
Landmark fixes
 2017-10-09 03:41:47 -04:00
Anewbe
ff7c4fe45a Makes a bunch of things fit in holsters 2017-10-07 17:24:18 -05:00
Anewbe
ccd90031fa Merge pull request #4018 from MisterLayne/10/4/2017_DufflebagsSci 
Science Dufflebag
 2017-10-06 10:51:05 -05:00
Anewbe
098bb66e4a Makes landmarks invisible, mobcorpse landmark actually despawns 2017-10-05 21:44:26 -05:00
MisterLayne
8aed98be14 Adds science dufflebag 2017-10-05 16:26:56 -04:00
Anewbe
66837464d2 Implanters should have an icon again 2017-10-04 23:07:59 -05:00
Neerti
4db89d42f5 Merge pull request #4014 from Anewbe/drone_permits 
Drone permits can now be worn
 2017-10-04 20:59:29 -04:00
Neerti
cf263e348e Merge pull request #3981 from Anewbe/gravetender 
Adds the gravekeeper lost borg module
 2017-10-03 23:01:15 -04:00
Anewbe
b393bb897d Repaths permits as accessories 2017-10-03 00:04:58 -05:00
Anewbe
bf6c9ba4b8 Drone permits can now be worn 2017-10-02 23:14:14 -05:00
Anewbe
5e635aff46 Adds a hacky method to put loadout implants in the user's antag records. Fixes a runtime. 2017-10-02 00:11:27 -05:00
Anewbe
46e411f80f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into tracking_implant 2017-10-01 21:52:36 -05:00
Anewbe
e82ea2d599 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into implanter_fix 
# Conflicts:
#	icons/obj/items.dmi
 2017-10-01 13:13:13 -05:00
Anewbe
b47ac1d76c Merge pull request #3991 from MisterLayne/9/30/17_BetterTRAY 
Better T-Ray Scanners
 2017-10-01 10:58:35 -05:00
Anewbe
5828e126fe Merge pull request #3995 from Cameron653/patch-5 
Removes second definition of katana
 2017-10-01 10:43:03 -05:00
Neerti
bc6f98c23a Merge pull request #3987 from Anewbe/frost_spider_poi 
Adds a frost spider nest PoI, adds frost spider things
 2017-10-01 01:26:55 -04:00
Anewbe
4dd9a4dbf2 Corrects the autospawn pod timer 2017-09-30 21:38:23 -05:00
Cameron653
9b7ed4fbcc Katana was defined twice 2017-09-30 17:35:11 -04:00
MisterLayne
568c9554ed Adds better Tscanners. 2017-09-30 10:59:38 -04:00
Anewbe
d067f70403 Adds the thing that spawns the gravekeeper drone 2017-09-30 02:00:10 -05:00
Mechoid
77f0e7514c Combat exosuits can now actually punch through walls and girders again, based on their 'force'. Fixes some to_chat's. 2017-09-29 22:10:48 -07:00
Anewbe
b3fdf3836e Adds a frost spider nest PoI, adds frost spider things 2017-09-29 22:01:41 -05:00
Anewbe
a5acb5d1bb Merge pull request #3971 from Neerti/9/28/2017_stack_asthetics 
Adds differing stack sprites
 2017-09-29 16:07:04 -05:00
Anewbe
969aa45e9a Switches 2 for DEAD 2017-09-29 12:07:16 -05:00
Anewbe
7c5d7c4d75 Improves tracking implant code, adds a tracking implant variant to the loadout 2017-09-28 20:25:46 -05:00
Anewbe
dffb3a6fef Merge branch 'master' of https://github.com/PolarisSS13/Polaris into scythe 
# Conflicts:
#	icons/obj/weapons.dmi
 2017-09-28 16:07:45 -05:00
Anewbe
ef1749009a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into implanter_fix 
# Conflicts:
#	icons/obj/items.dmi
 2017-09-28 15:56:53 -05:00
Neerti
d4dd908f94 Merge pull request #3962 from Anewbe/gravestone 
Adds grave markers
 2017-09-28 16:22:46 -04:00
Neerti
d2b3e7344c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/28/2017_stack_asthetics 2017-09-28 01:06:04 -04:00
Neerti
2f173dd16b Adds differing stack sprites 
Ports most of /tg/'s sprites for stacks displaying their contents.  I added some of my own as well to fill in materials that we have but they didn't.
Moves all stack icons to their own dmi.
Reworks fifty_spawners to use paths instead of strings, as it prevents bugs in the long term.
 2017-09-28 01:04:19 -04:00
Anewbe
7a13c8136f Finishing touches on gravemarkers 2017-09-27 18:59:26 -05:00
Neerti
853d8e80f1 Merge pull request #3914 from Anewbe/bone_fixer 
Adds the bone clamp, and some alien surgery tools
 2017-09-27 19:06:32 -04:00
Neerti
e0d450c5ea Merge pull request #3948 from Anewbe/flash_shield 
The borg shield now protects them from flashes
 2017-09-27 19:05:58 -04:00
Neerti
ab76e6d612 Merge pull request #3958 from Anewbe/legcuffs 
Changes Legcuff sprites
 2017-09-27 19:05:32 -04:00
Anewbe
eed312a8fb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into gravestone 
# Conflicts:
#	icons/obj/structures.dmi
 2017-09-27 13:49:56 -05:00
Anewbe
73ddd22296 Implanter tweaks 2017-09-27 11:59:59 -05:00
Anewbe
47f2854bb7 Makes the scythe a child of fireaxes, adds it to the weed control crate 2017-09-26 22:15:33 -05:00
Anewbe
280f3010f8 Adds grave markers 2017-09-26 21:03:34 -05:00
Anewbe
670ae66772 Merge pull request #3956 from Neerti/9/26/2017_old_farmer_harrison 
Adds Farm PoI
 2017-09-26 19:12:35 -05:00
Anewbe
c0205b1c78 Merge pull request #3953 from Woodratt/WR_09252017_SyndikatID 
Syndicate ID changes
 2017-09-26 16:03:16 -05:00
Neerti
447ad5de70 Merge pull request #3927 from Anewbe/intercom 
Adds more channels to intercom msg
 2017-09-26 07:00:40 -04:00
Anewbe
a4dd5056b0 Changes Legcuff sprites 2017-09-26 05:48:59 -05:00
Neerti
aa454c0e1d Adds Farm PoI 
Also fixes various bugs with surface tiles, hopefully.
Adds some documentation to the map file system.
Adds a new 'plane' map, ideal for testing PoIs by loading them manually.
Makes space heaters glow orange.
Adds a new grille type for fancy surface windows.
Adds self planting hydro trays/dirts if a seed is on top of them when the map is loaded.
 2017-09-26 01:44:06 -04:00
Anewbe
caa4fecd8b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bone_fixer 
# Conflicts:
#	icons/obj/abductor.dmi
 2017-09-25 20:35:19 -05:00
Neerti
13685ec747 Merge pull request #3926 from Anewbe/to_chat_watercloset 
Adds a few instances of to_chat()
 2017-09-25 21:32:13 -04:00
Neerti
1f9cf5b8f4 Merge pull request #3923 from Anewbe/catwalks_and_railings 
Improves catwalks and railings
 2017-09-25 21:31:28 -04:00
Woodratt
9f806e2f67 Syndicate ID changes 
- Added a Syndicate ID with all access (admin spawn only).
- Port of 'Syndicate id cards now listen for owner destruction' from Bay. Link https://github.com/Baystation12/Baystation12/pull/11563
 2017-09-25 17:01:55 -07:00
Anewbe
89716a13d0 The borg shield now protects them from flashes 2017-09-25 03:35:18 -05:00
Anewbe
d0a175994d Adds more channels to intercom msg 2017-09-24 02:00:58 -05:00
Anewbe
a2bc262b05 Adds a few instances of to_chat() 2017-09-24 01:32:52 -05:00