cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,298 Commits 10 Branches 0 Tags
5767a87d932fbc24c41b78bf6187516bf8d75c03
Commit Graph

8697 Commits

Author SHA1 Message Date
Cael_Aislinn
5767a87d93 increased threshold for wind sound to play 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-01 23:03:07 +10:00
Cael_Aislinn
f061470c3b money tweaks 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-22 23:16:23 +10:00
Cael_Aislinn
7932f1f795 removed extraneous line in detectivework/evidence.dm, removed constructing closets from plasteel 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-22 17:56:57 +10:00
Cael_Aislinn
0c2c999f74 money! re-added atms, created account system / accounts database, whole bunch of options for moving money around, some tweaks to spacecash and icons 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-22 17:56:34 +10:00
Cael_Aislinn
bb4be2c86a moved cryo cells to the same layer as tables - this will look weird for stuff on the top tile ('behind' the cry cell) but beakers wont be hidden underneath it when they're ejected any more, fixed typo in escape shuttle, fixed syntax error in new player setup screen 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 19:25:19 +10:00
Cael_Aislinn
66ce65a680 minor tweaks and cleanup with events, readded meteor shower and grid check events, removed most unused event files (left some interesting ones) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 19:15:38 +10:00
Cael_Aislinn
351e6d490c empty guns play a "click" sound 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 18:47:36 +10:00
Cael_Aislinn
632cad1044 observers can become mice, strange ore can be picked up in ore boxes/satchels, crates and closets can be built out of plasteel, changelog update 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 18:47:03 +10:00
Cael_Aislinn
05479bdb96 removed many alt_titles 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 12:07:49 +10:00
Cael_Aislinn
0752ca2fff changed erroneous name in sec hardsuit, reverted some derpy chemistry merging 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 05:38:04 +10:00
Cael_Aislinn
20aa136a08 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	code/game/machinery/hydroponics.dm
	code/modules/reagents/Chemistry-Reagents.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 05:05:17 +10:00
Cael_Aislinn
082af8f638 removed some duplicate events code brought in by mistake during tg port, fixed space ninja spam, renamed 'NSV Exodus' to 'NSS Exodus' 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 04:56:20 +10:00
Cael_Aislinn
3e6283403f cleanup of alt titles handling, made sechuds able to see icons for the real job if players have an alt title, made custom job titles via id computer into alt titles 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 04:55:02 +10:00
cib
5c97214b97 Removed an instance of spawning space ninjas I overlooked. This one would cause a space ninja to be spawned on every round, 6 minutes in. 2013-01-20 18:54:29 +01:00
cib
8de6998d83 Removed space ninja random event. 2013-01-18 23:37:51 +01:00
Cael_Aislinn
94447740e9 halves the speed of everything in hydroponics 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-18 15:36:02 +10:00
Cael_Aislinn
64640450f5 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-01-17 18:20:17 +10:00
Cael_Aislinn
d321a3aaf2 removed two more unused files 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-17 18:19:50 +10:00
Cael Aislinn
a5c1cf781a Merge pull request #2185 from CIB/feature 
Autopsy scanner fixes
 2013-01-16 17:57:35 -08:00
Cael Aislinn
f472e07cc1 Merge pull request #2194 from comma/master 
Surgeray
 2013-01-16 17:57:05 -08:00
Chinsky
69e06802ab Fixed issue #2158 
Now shutters will work with crowbar without asking.
 2013-01-16 22:09:03 +04:00
Chinsky
a2073134b3 Fixed runtimes in airflow. 2013-01-16 22:05:31 +04:00
Cael Aislinn
c32f1ac100 Merge pull request #2192 from CIB/BEF-premerge 
Metabolism fix
 2013-01-16 00:25:18 -08:00
cib
e181b90ca2 Bugfix: Fix metabolism rates for foods, drinks and sleep toxins. 2013-01-16 02:55:23 +01:00
Cael Aislinn
1f69e9a4f8 Merge pull request #2189 from GauHelldragon/bleeding-edge-freeze 
Re-ticking farmbots.
 2013-01-15 17:27:05 -08:00
Cael Aislinn
a70cbeb519 Merge pull request #2186 from RavingManiac/master 
Changes to the minimum number of players needed for a game mode to start
 2013-01-15 17:26:38 -08:00
MrYeti
7ba4df4462 Added Purple Gloves 2013-01-15 17:44:23 -05:00
GauHelldragon
85c9431aa4 Merge branch 'bleeding-edge-freeze' of git://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	baystation12.dme
 2013-01-15 13:59:10 -08:00
Mloc
cad798adad Merge pull request #2187 from CIB/BEF-premerge 
Merge pre-tg-merge BEF
 2013-01-15 13:29:59 -08:00
cib
cdda38b6be More fixes for issue #2153 
High/low body temperature damage now leaves an autopsy message.
 2013-01-15 21:23:03 +01:00
cib
aff12feaaa More fixes to autopsy scanner, issue #2153 
- Scanner will now print data even when only time of death is available.
- Scanner will reset chemtraces on new patient.
 2013-01-15 21:14:06 +01:00
RavingManiac
558fad6428 required_players_secret added, which is the number of players needed for a game mode to start when that mode has been chosen at random. 
required_players for most modes reduced to the number of antagonists + 1, as the variable is only used when the game mode is explicitly voted for.
 2013-01-16 04:10:59 +08:00
cib
4773361f64 Proper fix for the projectile runtime. 
Adds projectile autopsy messages back. Partial fix to issue #2153
 2013-01-15 19:46:30 +01:00
Chinsky
99770a8792 Fixed autopsy scanner defines. 
Committing map changes for faux.
 2013-01-15 20:26:55 +04:00
Cael_Aislinn
a8d7e5275a removed unused WIP file 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-16 00:20:05 +10:00
Cael_Aislinn
e423798b8d removed a bunch of unused files, moved amorphs and meme to workinprogress/cib 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-15 23:29:49 +10:00
Cael_Aislinn
70764ac039 tweaked some supply packs a bit, added formalwear and pizza supply packs, made supply packs organised and selectable by type in the order menu 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-15 23:20:00 +10:00
Cael_Aislinn
6b93cc9c91 added placeholder economic stuff (probably never finish it), added random system-wide events (which are announced at the newscaster when they occur) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-15 21:25:45 +10:00
Chinsky
0f561b141c Merge branch 'surgery' 2013-01-15 14:30:01 +04:00
Chinsky
6d830af37c Merge branch 'master' into surgery 
Conflicts:
	code/WorkInProgress/surgery.dm
	code/modules/mob/living/carbon/carbon_defines.dm
 2013-01-15 13:42:13 +04:00
Cael_Aislinn
dc42275ae2 bunch of new alt titles, based off forum and IRC suggestions 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-15 14:00:57 +10:00
Cael_Aislinn
e4db320f97 removed unused files, moved simple_animal/head 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-15 00:00:15 +10:00
GauHelldragon
b093f04310 Feature: Bang kitchen trays with rolling pin just like riot shield + baton 
The public demands it!!
 2013-01-14 05:49:39 -08:00
Cael_Aislinn
20cacd30de sanitize renaming id cards via computer and agent cards 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-14 23:44:16 +10:00
Cael_Aislinn
d532ec9712 add+fix missing files for jungle away mission, re-add missing atmos and security rigs, refactor and cleanup rigs 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-14 23:29:53 +10:00
Cael_Aislinn
8581932c57 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/game/objects/items/toys.dm
	icons/mob/back.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/uniforms.dmi
	icons/obj/weapons.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-14 22:14:46 +10:00
Cael_Aislinn
09a9c7458f runtime fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-14 21:46:12 +10:00
Cael_Aislinn
cf6aadef09 remove some unused files, tick barsigns.dm and removed duplicate definition 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-14 21:23:47 +10:00
Cael_Aislinn
1c9b04ec74 copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-14 21:07:16 +10:00
GauHelldragon
77d22749f1 Hydroponics trays will update icons after being weeded now. 2013-01-13 17:30:27 -08:00