cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-18 06:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,413 Commits 8 Branches 0 Tags
3882ac24e7d55b51a13d5c0b11d161fc5867aa9e
Commit Graph

4802 Commits

Author SHA1 Message Date
Miniature
cfb758228f Made capwhatever not do damage to soghun, since their food is apparently spicy (and it's an ingredient in sbiten, and is frequently left over when you make it, and according to me that's their drink and stuff) 
Might be worth making it not do actual damage to anyone, but eh.
 2012-06-20 00:31:12 +09:30
CompactNinja
0743fd1ab6 Merge pull request #1320 from Miniature/master 
Removed security channel from HoP headset.
 2012-06-19 01:34:28 -07:00
CompactNinja
5bdb3ba3e7 Removed one of my custom items, and added a new one. 
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
 2012-06-19 17:43:26 +09:30
Miniature
fa91040cf2 Removed security channel from HoP headset. 2012-06-19 17:36:57 +09:30
SkyMarshal
6f1e53de1d Map fix and hypothetical holodeck fix for UL 2012-06-19 00:38:57 -07:00
SkyMarshal
c3d7371ccf Lots of fixes. 2012-06-19 00:24:10 -07:00
SkyMarshal
8f0a815eb9 Fixed some stuff. 2012-06-18 23:59:07 -07:00
SkyMarshal
dffed10290 Fixed a long-lasting error with vending machine in toxins, fixed/added atmos setting editor in game. 2012-06-18 23:39:12 -07:00
SkyMarshal
57fcff3067 Shitload of bugfixes. 2012-06-18 21:18:26 -07:00
SkyMarshal
4f12065fbe Merge branch 'master' of github.com:Baystation12/Baystation12 into Lighting 2012-06-18 20:55:11 -07:00
SkyMarshal
b126bb5a1c Glowy space. 2012-06-18 20:50:16 -07:00
SkyMarshal
14de2f0ff5 Merge pull request #1314 from SkyMarshal/Lighting 
Ultralight, Sped up how fast fires burn and use fuel, Removed deletion logging (Speeds up world shudown),  added icon for welder fuel.
 2012-06-18 20:43:22 -07:00
SkyMarshal
e1d91d5eaf Fixes some bugginess with UL. 2012-06-18 19:57:49 -07:00
SkyMarshal
55193f24f6 Merge pull request #1313 from caelaislinn/master 
minor changes to artifacts
 2012-06-18 19:54:24 -07:00
SkyMarshal
ebe7993e69 Merge pull request #1311 from chickenswings62/master 
New constructional objects
 2012-06-18 17:55:53 -07:00
SkyMarshal
692fdc724e Second part of UltraLight. Some fixed up fire stuff. 2012-06-18 17:52:40 -07:00
SkyMarshal
aeb850fef0 Working UL 2012-06-18 15:02:34 -07:00
caelaislinn
d6d8007295 reduced spawn chance, added chance to touch on pull 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-19 07:56:47 +10:00
caelaislinn
f17439f1e3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-06-19 07:37:28 +10:00
chickenswings62
78b2dae2c1 Fixed it up, as a note. The best way to place this is to make a table on top of you, then the frame. I haven't yet figured out a way to make this fella spawn one tile ahead of sight. (I'm a newb as coding. But I'd love to help however I can.) 
Help would be welcome, of course.
 2012-06-18 23:05:57 +02:00
chickenswings62
20b1b0f1c9 Whoops, fixed the object name. 2012-06-18 20:38:57 +02:00
chickenswings62
de128e419a Added the coat rack, and filling cabinet to build able objects. Added a small version of the construction frame, starts unanchored to allow the player to put it in place. Cell chargers and normal rechargers are now buildable. 2012-06-18 20:02:22 +02:00
SkyMarshal
d9a8dc94a2 Merge pull request #1310 from CIB/master 
Nerfed chloral hydrate, buffed sleep toxin.
 2012-06-18 09:06:16 -07:00
CIB
09b7fdee1e Nerfed medical mecha sleeper capturing speed. 2012-06-18 06:16:56 -07:00
CIB
9bc85f2883 Fixed comma error. 2012-06-18 05:55:45 -07:00
CIB
85d99c78fc Nerfed chloral hydrate, buffed sleep toxin. 
- Chloral hydrate will now take a little longer to take effect and stay in your blood for a shorter duration
- Sleep toxin will now stay in your blood twice as long
 2012-06-18 05:52:39 -07:00
caelaislinn
0e1bcfc981 minor updates 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-18 22:41:00 +10:00
caelaislinn
2e5a5405a4 - Ported ISaidNo's artifact code. Will look into adding xenoarchaelogy [anomaly] base near RnD at some point. 
- Modified dme.
- Modified changelog.

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-18 22:37:56 +10:00
DeusDactyl
2c7c078ebe Grammar fixes 
Finally fixes tons of capitalization errors and whatnot in clothing.
 2012-06-17 20:58:42 -04:00
caelaislinn
25752d58cd more redacted updates 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-17 20:46:49 +10:00
caelaislinn
d4e25997db fix for an unsimulated turf bug 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-17 20:42:28 +10:00
caelaislinn
9705edff08 some missing contraband changes (increased BS12 poster %) 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-17 20:41:58 +10:00
caelaislinn
e8d1a3b2ff Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-06-17 02:27:10 +10:00
caelaislinn
657ac7ab7b [redacted] 
(I've fully tested it, it works nicely)

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-17 02:24:37 +10:00
Miniature
2898b6813b Added a thing to give a message to admins when a tile is stepped on, requested by Hawk. 
To use, spawn a /obj/effect/admin_log_trap on whatever tile you want to have a message, then whenever anyone steps on that tile a message will sent to all admins, like explosions.

Feel free to move it out of my WIP folder if you want.
 2012-06-16 22:28:47 +09:30
Albert Iordache
a6b3ab8344 Raised the amount of toxloss humans get per tick from not being in a breathable environment 2012-06-16 15:41:53 +03:00
caelaislinn
e256c40f86 possible glitch with contraband 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-16 20:12:21 +10:00
caelaislinn
93fddbf8c7 added glass descriptions for new alcohols 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-16 12:34:33 +10:00
caelaislinn
f1782ec017 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/WorkInProgress/Cael_Aislinn/energy_field.dm
	code/WorkInProgress/Cael_Aislinn/external_shield_gen.dm
	code/WorkInProgress/Cael_Aislinn/shield_capacitor.dm

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-16 12:02:29 +10:00
caelaislinn
fc1ef5e4d2 adding reverted files 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-16 11:42:33 +10:00
caelaislinn
5dff5ccc43 adding missing shield files 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-16 11:34:39 +10:00
Hawk-v3
e68a32c173 Revert All of Cael_Aislinn's stuff from the last day, committed by Cib. 
Reason: Compile Error, hung server. Damnit Cael.
 2012-06-15 22:33:18 +01:00
Mloc
9064a15bca Merge pull request #1297 from CIB/master 
No more involuntary and jobbanned antags
 2012-06-15 07:48:38 -07:00
CIB
e9c3cba9da Merge pull request #1291 from caelaislinn/master 
buildable shield generators, new contraband items, misc
 2012-06-15 03:39:43 -07:00
cib
8e17e28dd4 Mode setup no longer forces people into antagonist. 
Instead of trying to get the necessary antags no matter what, mode setup
will now treat a lack of volunary antags just like a lack of total
players
and
abort the mode.
 2012-06-15 12:32:20 +02:00
SkyMarshal
b5435aaab2 Merge pull request #1293 from CIB/master 
Separate moderator listing.. also an old commit
 2012-06-14 11:34:30 -07:00
cib
fc54aabaff Merge branch 'master' of github.com:CIB/Baystation12 2012-06-14 20:26:19 +02:00
cib
647e1c71fd Added a separate config/moderators.txt config file 2012-06-14 20:24:38 +02:00
CIB
84122a8ca3 Merge pull request #1286 from SkyMarshal/Blueprints 
Blueprints updates, removed duplicate proc.
 2012-06-14 11:10:42 -07:00
CompactNinja
3748b07ec1 Custom item for RawrTaicho. 2012-06-15 03:03:42 +09:30