cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,912 Commits 8 Branches 0 Tags
b51bc5e32219c3f200de939c599bd50dbc7d7cfc
Commit Graph

987 Commits

Author SHA1 Message Date
Kilakk
a5609c8150 Adds ability to change appearance for ERTs 
* ERTs can change their own appearance
* Fixed an if statement I goof'd
 2013-06-08 18:51:26 -04:00
Kilakk
faf5b86e49 Changed the way ERTs are selected 
* Ghosts get a pop-up thingy that asks them if they want to be
considered
* Ghosts that're antag-banned and/or jobbanned from security officer are
exempt
* 30 second timer because timers are !!FUN!!
 2013-06-06 23:29:15 -04:00
Kilakk
d1faeac8d8 Adds emergency response team verb 
* Adds a verb for (b)admins in "Special Verbs" that lets you spawn in an
emergency response team a la deathsquid-button
* Spawned-in ERTs can choose their own ridiculous name
* Command alerts, because everyone loves those
 2013-06-06 17:04:49 -04:00
Segrain
f35290bf25 Engineering tape can be placed on doors. 2013-05-30 19:30:36 +03: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
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
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
cib
ac8b64734b Fixed a few problems with newscasters. 2013-05-19 07:47:18 +02:00
cib
b6231ec33b Added more community news. 2013-05-19 06:03:39 +02:00
cib
8cfc395232 Added community-made newsfeeds. 
Yay!
 2013-05-18 23:20:20 +02:00
cib
be197afc77 Added system for newscaster events. 
This way people can write stories, separated into several pieces, which will be announced through the newscasters over the course of the round.
 2013-05-18 13:06:16 +02:00
SkyMarshal
5884f24f6a Adjusting air alarm settings. 
"Scrubbing" is the default mode
"Panic" empties the room
"Fill" turns off the scrubbers and activates the vents in an effort to replace lost air
"Cycle" will trigger first a panic siphon then a fill mode in order to empty a room of contaminants before refilling it from the supply pipes
"Replacement" will turn on the panic siphon while continuing to add air into the room
"Off" will disable all attached devices. (This is useful for breached areas)
 2013-05-16 17:29:58 -07:00
SkyMarshal
88a65b63e4 Fixes air alarms going off if the upper bounds were set to disabled. 
Fixes atmos control computer displaying some air alarms in unreadable yellow
Fixes a text error in item descriptions.
 2013-05-15 14:31:31 -07:00
SkyMarshal
697ab3dd7f Centcom now has sexy uniforms and IDs. Emag now looks like modified standard ID card 2013-05-11 03:39:31 -07:00
Mloc-Argent
27759f47df Merged master into BEF. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-05-06 15:43:50 +01:00
Cael_Aislinn
29a3e93197 added safety checks for bad values in eftpos + atms 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-05-03 13:20:47 +10:00
Cael_Aislinn
ba763477eb fixed shield generators not charging fields 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-04-26 21:46:36 +10:00
SkyMarshal
6a38e51c73 Atmos control auto-update fixes 
Air alarms now auto-refresh and have a mechanism to heat or cool rooms.
Space heaters can both heat and cool rooms
 2013-04-19 01:52:24 -07:00
Uristqwerty
6a66f542d9 Update from early tubes with bugs, to tubes with less bugs and more features based on feedback. 2013-03-20 18:49:14 -04:00
Chinsky
729e187ae6 Merge pull request #2546 from caelaislinn/bleeding-edge-freeze 
Tweaks and such
 2013-03-18 00:15:47 -07:00
cib
7fbc86da5a Vendors now charge money. 
Swipe your ID card and enter PIN to pay.
 2013-03-17 15:56:43 +01:00
Cael_Aislinn
42d8cd33e0 made fuel injectors and core gens properly start in mobile configs, made large crates able to hold 1 large item (machinery or structure) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-16 20:58:31 +10:00
Cael_Aislinn
f8f9397636 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	icons/obj/library.dmi
	icons/obj/storage.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 23:01:33 +10:00
Cael_Aislinn
44470e35b5 moved energy field layer to be above mobs 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 18:21:00 +10:00
Chinsky
55671d7485 Merge branch 'guntest' of https://github.com/Whitellama/Baystation12 into gunmode 
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
	icons/mob/screen1_old.dmi
 2013-03-06 17:04:45 +04:00
Cael_Aislinn
53793fc2aa Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	baystation12.dme
	code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
	icons/obj/storage.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 19:03:18 +10:00
Cael_Aislinn
00b0c09016 core gens start locked, added placeholder core monitor file 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 01:29:48 +10:00
Cael_Aislinn
2933069ebe Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 17:23:16 +10:00
Cael_Aislinn
9ca69998d0 cleaned up/added some missing icon_states for (rust) engineering areas 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 16:51:09 +10:00
Cael_Aislinn
09399cb74b some tweaks and balances to rust circuit research levels 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 16:47:26 +10:00
Cael_Aislinn
c6398d6d52 fixed some core field runtimes, made it actually process 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 16:41:10 +10:00
Cael_Aislinn
e511bf954e fixed icon + useability + construction issues for misc rust components, removed debug output for TEGs, made injectors no longer directwired 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 16:23:59 +10:00
Cael_Aislinn
53cfbaa480 tweaked some rust icons 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 16:22:35 +10:00
Christian Bielert
2a9f199441 Merge pull request #2469 from Uristqwerty/Tubes 
Added: Code and icons for tube-based transportation.
 2013-03-02 09:37:01 -08:00
Uristqwerty
b455c42d96 Added: Code and icons for tube-based transportation. 
Just an additional tool that mappers may find interesting or fun. At the moment, they do not use power or any resources, and there is plenty of room to extend and improve them, but they do work.

The basic tubes will read their directions from icon_state if they aren't specifically specified, so you can just use the built-in option to generate instances from icon states to get all possible tubes.
The tube stations use directions, instead.
 2013-03-02 04:17:58 -05:00
Zuhayr
48fefead00 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-03-01 23:15:38 -08:00
Zuhayr
ad47e954ce Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-03-01 23:15:19 -08:00
Cael_Aislinn
533794b0db some useability tweaks to atms 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-01 00:45:33 +10:00
Cael_Aislinn
4633373d1f fixed an issue with database reconnection 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-01 00:23:22 +10:00
Cael_Aislinn
67a4a94896 atm fix mk 2 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-01 00:15:17 +10:00
Cael_Aislinn
43ebfd1fdd tweakfixes to finances 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-27 11:55:28 +10:00
cib
26b4deb33f Department accounts are created now and credentials given to heads. 2013-02-27 01:55:18 +01:00
Cael_Aislinn
cfa3916b95 new events (pda spam, trivial and mundane news items, lotto, hacker) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-26 03:02:24 +10:00
Cael_Aislinn
02ace92b04 miscellaneous tweaks to finance machines 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-26 02:59:04 +10:00
Cael_Aislinn
c1eda324b8 inserting cards into atms only wipes the screen if the card is for a different account, cleaned up dme 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 14:43:52 +10:00
Cael_Aislinn
46ecf43cf9 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	baystation12.dme
	code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
	icons/obj/device.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 14:40:46 +10:00