cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,640 Commits 5 Branches 0 Tags
c842f21bc5ce3393b4ce1bd771a6f3156a38e39d
Commit Graph

9597 Commits

Author SHA1 Message Date
VitrescentTortoise
c842f21bc5 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-05-26 00:45:47 -07:00
VitrescentTortoise
b13424322a Chants changed to things less silly. 2013-05-25 17:51:12 -07:00
VitrescentTortoise
6f6731dab0 Resizes lobby manifest window 2013-05-25 16:53:07 -07:00
Chinsky
76525a4ccf Merge pull request #2852 from VitrescentTortoise/bleeding-edge-freeze 
Changeling husk names now 'Unknown'
 2013-05-25 16:03:24 -07:00
VitrescentTortoise
827e85c4c3 Properly sets husks' names to unknown 2013-05-25 16:00:22 -07:00
cib
a764c226f8 Implemented a system to avoid the same event happening too often. 
Also bumped event frequency, this shouldn't be as bad with the same event not repeating itself that often.
 2013-05-26 00:12:59 +02:00
VitrescentTortoise
c451287aa8 The name of changeling husks is now unknown 2013-05-25 14:17:16 -07:00
VitrescentTortoise
afb49c05d9 Fixed lemonjuice showing up as ..what? 2013-05-25 12:52:56 -07:00
Jim "Apples"
858d98eb7c Merge pull request #2816 from comma/HTML 
HTML in papers
 2013-05-24 14:30:36 -07:00
Asanadas
e0f4b0d1ed Bugfix: Prevents airlock_controller.dm and similar from being destroyed by mech drills or acid. Prevents headaches. 2013-05-24 14:55:28 -04:00
meyar
1ac5ac6ec5 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-05-24 07:55:24 -04:00
meyar
1d5d7cb901 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-05-24 06:52:03 -04:00
meyar
c1e701f32b Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
 2013-05-24 05:23:36 -04:00
fauxtada
cb5b83fadb Wall Charger Addition / Map Edits 
- Puts in wall recharger sprite. For all your wall recharging needs.
- Reverts changes someone did moving my wall temp placement wall rechargers..
- Fixes airlocks over doors issue in sec.
- Also removed the access medical from the medical area of security. It's just a quick area to treat cuts and bruises, and shouldn't have items that treat more then that.
- Fixed some more weirdly placed rechargers around the station.
- Replaced the TG Maltese Falcon sign with the BS12 one.
- Fixed up the floor in the pool area.
- Added some lights and decorative items to that weird tator / table area south of the security pod. As well as a water tank and fuel tank.
 2013-05-23 17:46:31 -07:00
cib
e9fc666cdb Removed hijack from wizard. 2013-05-24 00:12:29 +02:00
cib
0bfb43b864 Removed hijack objective. AGAIN. 2013-05-24 00:09:47 +02:00
cib
89aa936147 Fix to organ_failure event. 2013-05-23 22:46:27 +02:00
cib
b5217d862a A few fixes to rp-rev 
- Name was empty, hopefully using real_name fixes that
- Announcements coming too quickly
- Fixed icon path issue
 2013-05-23 22:12:20 +02:00
cib
c4b8ef6e59 You can't close emagged doors anymore, but you can still remove circuitry. 2013-05-23 20:27:13 +02:00
cib
b1b448e0ee Adjusted event announcement delays. 
Also improved some radiation belt announcements.
 2013-05-23 20:15:45 +02:00
cib
ce19719700 Fixed two problem with airlock/APC commit: 
- Debugger now sends messages to user instead of usr(whoops)
- Can now close emagged door with crowbar so you can take out circuit
- Couldn't weld emagged doors
- Replacing the circuitry should now be sufficient to fix an emagged door.
 2013-05-23 19:47:33 +02:00
cib
aa6bfc33c7 Airlock and APC changes. 
- Added a debugger device that can figure out when an object has been hacked/emagged
- Hacked APCs no longer display blue screen
- You can now disassemble emagged airlocks, they will yield a fried airlock electronic.
 2013-05-23 16:43:29 +02:00
Chinsky
8b60bab4a7 Merge pull request #2835 from Roaper/master 
No tears, only dreams
 2013-05-23 01:55:45 -07:00
Roaper
cb59473d02 Added more dreams to Dreaming.dm 
Signed-off-by: Roaper <roaperable@gmail.com>
 2013-05-22 13:36:27 -07:00
Chinsky
6ef40ee7a7 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
 2013-05-22 21:35:50 +04:00
Chinsky
317cbd8438 Merge branch 'master' into bleeding-edge-freeze 
Conflicts:
	baystation12.dme
 2013-05-22 16:51:41 +04:00
Chinsky
bdb16b1f99 Renamed bruise pack back to gauze. 
STAY LIKE THAT.
 2013-05-22 14:05:53 +04:00
Mloc
80b8a5e70f Merge master. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2013-05-22 10:53:29 +01:00
Chinsky
1ca42d0c88 Fixed some sharp stuff not being recognized as such. 
That lead to knives bruising people you stab, for example.
 2013-05-22 12:55:15 +04:00
SkyMarshal
6c8b0c23dc Small fixes, updated changelog. 2013-05-21 23:12:47 -07:00
SkyMarshal
39df196edc Fixed disposal issue. 
Delayed Jungle setup until after air master initializes
Master controller now properly ceases atmos simulation if runtimes occur (and are detected).
Cleanup more ZAS stuff.  FEA_system.dm, ZAS/ZAS_Turfs.dm, ZAS_Zones.dm.
Canisters now autoconnect to portables connectors on creation.   (Fixes airlocks not having attached canisters)
Doors can now be made which respect directional door types (e.g. windoors and directional firelocks) and is handled better.
 2013-05-21 23:12:47 -07:00
SkyMarshal
46907066ba Somgfkuf 2013-05-21 23:11:54 -07:00
SkyMarshal
3420b0a6fe Cleanup Debug.dm and Functions.dm 2013-05-21 23:11:53 -07:00
SkyMarshal
0ede4e13f9 Cleaned up and commented Connection.dm 
Signed-off-by: SkyMarshal <skymarshal1729@gmail.com>
 2013-05-21 23:11:53 -07:00
Chinsky
4885a08b27 Added 5 TC uplink to RevHeads. 2013-05-21 19:24:53 +04:00
Chinsky
1b0c6b942a NOW IT COMPILES. 
Incomplete rename.
 2013-05-21 18:08:28 +04:00
Chinsky
1da1592ac2 Merge pull request #2818 from CIB/feature 
Space no longer has a heat_capacity
 2013-05-20 16:31:52 -07:00
cib
3b09c8b3a6 Space no longer has a heat_capacity 
I mean, seriously? Magical realm of heat absorption? Screw that, space is now room temperature!
 2013-05-21 00:46:12 +02:00
Chinsky
99fcf1b3be Merge pull request #2819 from Roaper/master 
Readded Pockets in the Responder Jackets
 2013-05-20 14:34:15 -07:00
Roaper
99ff1f7ee0 Added Pockets to First Responder Jacket 
Signed-off-by: Roaper <roaperable@gmail.com>
 2013-05-20 13:33:44 -07:00
Chinsky
048c6845e9 Merge pull request #2796 from CIB/report_adjustment 
Experimental report balance change
 2013-05-20 12:36:50 -07:00
Chinsky
e032e3101d Merge pull request #2811 from caelaislinn/xenoarch 
Xenoarch tweaks
 2013-05-19 04:24:15 -07:00
Cael_Aislinn
1784bcbb04 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into rust 2013-05-19 19:41:18 +10:00
Cael_Aislinn
454d67d899 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into rust 2013-05-19 19:34:10 +10:00
Cael_Aislinn
7067382f52 hardcapped xenoarch machinery heat to 177K, made xenoarch machinery only produce heat when scanning, added a couple of missing tools to the gearbelt 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-05-19 19:12:42 +10:00
Cael_Aislinn
9d17d24063 rewrote fusion reactions to use datums instead of a switch statement (with reaction recipes stored in the master controller for debug editing), restructured fusion recipes to be more balanced + gameplay-centric, rewrote fusion reactions to use (mostly) fictional elements, miscellaneous fixes and cleanup 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-05-19 19:08:57 +10:00
Cael_Aislinn
751adf7187 miscellaneous rusk tweaks and fixes including: resolved assembly sprite hiding under things, resolved compressor not producing assemblies with the right amount of matter, made injectors able to be rotated, removed cooldown from injector to port assembly swap, made ejected/created assemblies not appear in the middle of walls (being created from wall-mounted machinery), 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-05-19 19:05:51 +10:00
meyar
ebe2e26ed3 Fixes the Syndicate nuke shuttle airlock (In that it cycles now) 
Re-added external airlock access to the traitor ID card, restoring lost functionality.
Fixed the ERT radio. It now works.
 2013-05-19 05:00:06 -04:00
Cael_Aislinn
1d9fe082d7 made TEG generate power from heat transferred again, restructed TEG and circulator code to be smaller and cleaner, added an "overload" to TEGs where they spark + power output drops if power output exceeds 250k 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-05-19 18:50:15 +10:00
cib
f5b0b52b6c Added stasis bag. 
This stops all life functions of a patient for a while. It can only be used once, and inflicts low amounts of brain and clone damage over time.
 2013-05-19 07:48:43 +02:00