cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,439 Commits 8 Branches 0 Tags
901bfe7c664836f1efa93cd8ed2ccd05e3fb8eb6
Commit Graph

685 Commits

Author SHA1 Message Date
Zuhayr
136ccc347b Merge with dev. 2014-06-12 01:14:40 +09:30
Zuhayr
4ee8f56c29 Merged master to dev, manually fixed merge issues in map, may be some left. 2014-06-11 18:11:41 +09:30
Zuhayr
c841db56b6 Merge branch 'mining' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-11 09:24:28 +09:30
mwerezak
a8816823a5 Replaces get_turf_loc() with get_turf() 
The former does exactly the same thing as get_turf(), except it runtimes
if one of the atoms has a null loc.
 2014-06-10 13:43:11 -04:00
Zuhayr
9e7fe6d700 Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this. 2014-06-11 01:14:38 +09:30
sick-trigger
027514c6f3 Feed other text fix 
Fixes #5199
 2014-06-10 10:37:43 +10:00
Zuhayr
c2f2a7cde6 Refactored material definitions a little bit, removed all bananium from the codebase. 2014-06-08 00:40:34 +09:30
sick-trigger
aecf06028e Painkillers leave body correctly 
Tramadol, paracetamol and oxy will now leave a mob's body. Fixes #5150.
 2014-06-05 18:09:18 +10:00
Zuhayr
1e135f91af Merge resolution with master. 2014-06-02 12:05:12 +09:30
Zuhayr
5f98ccaaf8 Added smaller spraybottle for drones. 2014-05-31 22:15:28 +09:30
Mloc-Argent
ee2e68960a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/admin/admin_verbs.dm
 2014-05-31 00:17:56 +01:00
mwerezak
296336e15e Small fixes 2014-05-22 18:19:55 -04:00
mwerezak
637f7193fc Fixes circuit var for other consoles 
Also cleans up attackby while we're at it.
 2014-05-22 18:05:57 -04:00
Jarcolr
68326eaf95 Adds simple peanuts to hydroponics 
Thanks to Nienhaus for the sprites.
http://baystation12.net/forums/viewtopic.php?f=44&t=9984
Will update this with more applications for peanuts soon.
 2014-05-17 11:48:21 +03:00
Mloc-Argent
e24dd57a65 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
 2014-05-14 22:42:03 +01:00
Ravensdale
8e15a76da1 Fixes runtime with yellow slime extracts. 2014-05-12 01:15:45 -07:00
Mloc-Hibernia
e3a8d5eb43 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm
 2014-05-11 13:19:09 +00:00
Zuhayr
a68c4e9c55 Fixes #3993 2014-05-10 10:26:05 +09:30
Mloc-Argent
6a11ca32f8 Merge remote-tracking branch 'upstream/master' into dev 2014-05-05 22:22:01 +01:00
Mloc-Argent
e1ddec4a73 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-05-03 16:56:19 +01:00
Zuhayr
c526b9c29a Lousy goddamn indentation. 2014-05-03 21:09:55 +09:30
Zuhayr
378e6865d4 Attempting to stop IPC from eating and drinking. 2014-05-03 20:25:36 +09:30
Ccomp5950
976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-04-25 21:14:58 -05:00
Brian Cook
182be1a8d3 Added bucket lid sprite and functionality 
Buckets can be lidded, however there is no change in the sprite when
this happens. This adds a lid and it's functional in game.
 2014-04-22 01:57:01 -07:00
Mike
e76f431687 Adjusted fuel spread 
Made fuel stickier, so it spreads less thinly.
 2014-04-17 21:19:05 -04:00
Mike
9162ea03bb Fueltanks leak fuel when wrenched open 
Fueltanks now actually leak fuel when wrenched open. The leaking only occurs at the initial wrenching and when tank is moved.
 2014-04-17 20:54:19 -04:00
Ravensdale
68eda5201b Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron 
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/modules/paperwork/paper.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-04-16 21:44:26 -07:00
Ravensdale
1d6655850f Changes all appropriate instances of toxins to phoron 2014-04-10 15:11:26 -07:00
Ravensdale
a3e4a43536 Changes most viable, used entries of plasma with phoron. 2014-04-10 05:05:04 -07:00
Ravensdale
e6c3fbf071 Changes all appropriate instances of 'Plasma' to 'Phoron' 2014-04-10 01:19:49 -07:00
Chinsky
06fd99b9ba Merge pull request #4723 from Jarcolr/diction 
Fixes some typos and descriptions
 2014-04-09 21:48:19 +04:00
Jarcolr
868dea5681 Grammar patch 1 
This is just the first one of many.
 2014-04-08 14:48:31 +03:00
DJSnapshot
772edffad1 Merge pull request #4700 from Jarcolr/diction 
Spaghetti isn't called spagetti anymore
 2014-04-05 17:05:06 -07:00
Jarcolr
bec699bb7c Spaghetti isn't called spagetti anymore 
Didn't change the code/vars/recipes; just fixed the Name line to the
proper spelling.
 2014-04-05 18:13:19 +03:00
Graham Lloyd
72e45ebf7b A first pass at more realistic w_class values 2014-04-03 17:54:06 -04:00
Ccomp5950
2027892395 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-03-28 18:48:05 -05:00
Ccomp5950
56ef5c165c Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm
 2014-03-28 18:46:04 -05:00
Jeremy Liberman
16f787a1da Virology - NanoUI, gameplay tweaks, bugfixes 2014-03-24 23:55:41 -05:00
Mloc-Hibernia
dc97a2502a Revert "Merge pull request #4607 from Aryn/master" 
This reverts commit a1fee3e6c3, reversing
changes made to bf4533efde.
 2014-03-24 13:54:11 +00:00
Jim "Apples"
ae2c398b26 Merge pull request #4611 from Aryn/to-master 
Ctrl-H "faggot" to "meatball" and one icon state change.
 2014-03-20 11:22:37 +00:00
Aryn
de86280434 Ctrl-H "faggot" to "meatball" and one icon state change. 2014-03-20 05:05:23 -06:00
Aryn
1b8dc12a7c I think I fixed everything it is possible to stuff a light source into. 2014-03-19 01:02:27 -06:00
Jarcolr
6300e859a2 Fixes #4600 
Will fix #4600 and the problem with drinks not knowing when they are open/closed.
Hopefully I didn't miss a string of code again,I don't think so,though.
 2014-03-17 23:13:29 +02:00
Jeremy Liberman
31c79acd6e Fixes biogenerator typo, improper beaker splashing, and allows glass beakers to refill botany trays 2014-03-16 21:16:31 -05:00
Joey Haas
38d43fa971 Medbay, Xenobiology and Virology now have secure smartfridges. 2014-03-07 21:39:06 +01:00
Joey Haas
78e4f7e126 We now have secure smartfridges. More changes: 
Changed xeno smartfridge to a secure smartfridge.
Added a chemistry/medical smartfridge for easy chemical storage.
Smartfridge usage now leaves fingerprints.
Secure smartfriges are emagable, by the way!
 2014-03-07 21:32:13 +01:00
RavingManiac
b969e680b2 Ingested acid and mutagen will now react after the ten second delay. 2014-03-06 20:20:15 +08:00
RavingManiac
f022a19452 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	maps/tgstation2.dmm
 2014-03-06 19:22:06 +08:00
RavingManiac
3b2d3eba05 trans_to_ingest now used for consumption of food, drink and pills instead of trans_to. This adds a ten second delay between ingestion and addition of the reagents to the body. 2014-03-05 23:41:42 +08:00
Ccomp5950
c066232ab3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2014-03-04 18:29:03 -06:00