cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,893 Commits 6 Branches 0 Tags
6ddbb9097b4e8011d7befc2e944da63f1b0426ec
Commit Graph

2902 Commits

Author SHA1 Message Date
CaelAislinn
6ddbb9097b added missing file 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-15 17:17:03 +10:00
CaelAislinn
95b521dede Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-02-15 07:04:43 +10:00
CaelAislinn
43ead88027 fixes to new clothing 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-15 07:04:26 +10:00
CaelAislinn
9d798d3f95 updated some sprites, added new clothing 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-15 06:58:50 +10:00
CIB
9d12cf6c12 Merge pull request #422 from SkyMarshal/master 
More update_clothing() calls.
 2012-02-14 11:15:42 -08:00
SkyMarshal
7e140afe56 Added more update_clothing() calls 2012-02-14 12:12:42 -07:00
Albert Iordache
86be3a959b Merge pull request #418 from Miniature/little_things_thread 
Made lights repairable, wire->screwdriver
 2012-02-14 04:30:34 -08:00
Albert Iordache
aa04eed7e8 Merge pull request #417 from SkyMarshal/master 
Should reduce lag, mobs no longer update icons ever tick.
 2012-02-14 04:20:00 -08:00
SkyMarshal
2a0bb6e822 Merge pull request #407 from Abi79/master 
Small optimizations to metroid AIprocess()
 2012-02-14 02:57:05 -08:00
SkyMarshal
3a2beedb15 Merge pull request #412 from Miniature/master 
Reduced max positions for a bunch of jobs
 2012-02-14 02:56:52 -08:00
Miniature
a86e2ed94e Made lights repairable, wire->screwdriver 
Also glass to make broken ones into burnt ones, independent of rewiring
 2012-02-14 18:08:28 +10:30
SkyMarshal
f59fb6af94 More updates, added comfy chairs. 2012-02-13 23:28:12 -07:00
SkyMarshal
0fe42327a5 This should hopefully reduce processing requirements, by not rebuilding icons every tick. 
(Ported oldcode, all props to Strumpetplaya)
 2012-02-13 21:54:22 -07:00
SkyMarshal
3fbcbfe448 Merge pull request #416 from SkyMarshal/master 
Bugfixes for Borg&Doors
 2012-02-13 15:58:17 -08:00
SkyMarshal
42be0feff6 Bugfix for borgs&doors as well as chem grenades. 2012-02-13 16:56:34 -07:00
Mloc
b690b1386f Hotkeys here! Adds alt-click (pull object), ctrl-Q and ctrl-E (cycle backwards and forwards through the intents). 
Signed-off-by: Mloc <colmohici@gmail.com>
 2012-02-13 20:18:17 +00:00
CaelAislinn
9ee093b70e added a couple of new hats, updated some sprites 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-14 06:05:40 +10:00
Miniature
96353ded8d Reduced max permissions for a bunch of jobs 
botanist
atmos tech
roboticist
geneticist
chemist
 2012-02-14 02:39:59 +10:30
Miniature
006e91f4c1 Made dexalin and cloneoxadone use a slight amount of plasma, in addition to requiring it as a catalyst. 
No, it doesn't make sense for oxygen being in the presence of plasma to transmute into dexalin.
 2012-02-13 23:15:23 +10:30
Tastyfish
8b6441d8d0 Merge remote-tracking branch 'upstream/master' 2012-02-13 01:12:13 -05:00
Tastyfish
e20d4cf4db unvert abi's commit now that we foudn the problem 2012-02-13 01:07:43 -05:00
Tastyfish
47ec6a7021 re-renable things, now that things aren't exploding 2012-02-13 01:01:33 -05:00
SkyMarshal
6cb78379c3 Fixes for DOOMFIRES. 2012-02-12 15:00:43 -07:00
Albert Iordache
d848f7195a Small optimizations to metroid AIprocess() 2012-02-12 22:06:43 +02:00
Mloc
1d4567bfc4 Merge pull request #404 from Uristqwerty/master 
Three fixes for the Runtime Errors topic.
 2012-02-12 12:01:06 -08:00
SkyMarshal
c2e4a64201 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-02-12 12:48:16 -07:00
SkyMarshal
3d284270f7 Fix for command reports and hacktools. 2012-02-12 12:47:36 -07:00
Uristqwerty
8e84ff57df Three fixes for the Runtime Errors topic. 
- null.check_tile_graphic() in FEA_system
- "Cancel".network in /proc/camera_network_sort
- "d699999427062f612349cb4948a6eb...".len (Might not be fixed entirely, but I fixed one place that it was being set incorrectly)
 2012-02-12 13:54:52 -05:00
Albert Iordache
844ebef867 Merge pull request #403 from Tastyfish/master 
can eat normally with fork, med console upgrade
 2012-02-12 10:54:07 -08:00
Albert Iordache
c0ba7f227d Fixed cloning-related runtime error. 2012-02-12 19:58:24 +02:00
Tastyfish
0dc9bc325b upgraded medical console to be like sec console 2012-02-12 09:55:02 -05:00
Tastyfish
aeafc2ffa5 can eat all foods with fork like a sane person now 2012-02-12 07:07:16 -05:00
Tastyfish
b0815b8e1d Merge pull request #402 from CIB/master 
Space carp fixes
 2012-02-12 02:54:35 -08:00
cib
36801aecec mend 2012-02-12 11:51:00 +01:00
cib
d21de6271c Space carp and other critter balancing. 
They're less likely to attack and move slower now.
 2012-02-12 11:48:15 +01:00
Tastyfish
bf502d4dd4 forgot to push this file with job updates, gives doc virology access 2012-02-12 04:25:01 -05:00
Tastyfish
9ccc91f3ae Merge pull request #396 from Abi79/master 
Skipping computer ID checks for bans
 2012-02-10 15:15:58 -08:00
SkyMarshal
80eae068fd Merge pull request #400 from Tastyfish/master 
rejuvinate resets body temp, stabilize atmos restabilizes a chosen area
 2012-02-10 15:15:21 -08:00
Albert Iordache
a6f89fefee Merge pull request #398 from caelaislinn/master 
new custom items
 2012-02-10 14:32:38 -08:00
Tastyfish
41ab9956d3 Merge remote-tracking branch 'upstream/master' 2012-02-10 17:16:09 -05:00
Tastyfish
bc2817a0a4 rejuvinate resets body temp, stabilize atmos restabilizes a chosen area's atmos 2012-02-10 17:15:50 -05:00
CaelAislinn
0edd231592 added new custom items 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-11 07:24:50 +10:00
Head
bff5a0fecc Added new shortcut for examine (ctrl + left click). 2012-02-10 20:36:55 +01:00
Albert Iordache
a28ade459a Small fix. 2012-02-10 21:09:34 +02:00
Albert Iordache
1f1ea35a75 Added a way to skip the computer ID check for bans, and cleaned up the code a bit 2012-02-10 21:01:20 +02:00
Tastyfish
bd6fbb5fe8 fix to sky's reagent effects changes 2012-02-10 00:07:29 -05:00
Tastyfish
1332516180 Merge remote-tracking branch 'upstream/master' 2012-02-09 23:59:30 -05:00
SkyMarshal
1d29574bc3 Part 2 of the WIP chemistry stuff 
Map update with secure doors!
 2012-02-09 21:50:50 -07:00
Tastyfish
e922a7fadb bugfix: wall not hiding level 1 pipes 2012-02-09 23:31:04 -05:00
SkyMarshal
c38d7d1d8f Merge branch 'master' of github.com:Baystation12/Baystation12 2012-02-09 16:36:17 -07:00