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
14,790 Commits 8 Branches 0 Tags
a4e5bad4098b901bab0594fccf921ebaf831e4fe
Commit Graph

11004 Commits

Author SHA1 Message Date
Zuhayr
0d35284d50 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-21 01:46:10 -07:00
cib
b4c6fc306f Lowered organ max damage across the board. 
As it was, the only way for organs to be detached was when you were dead.
 2013-06-21 10:00:51 +02:00
Chinsky
e46e3737bc Merge pull request #3112 from Zuhayr/feature 
Dart gun, darts, fixes from master.
 2013-06-21 00:03:21 -07:00
Chinsky
32fd044e52 Merge pull request #3103 from AppleMaster/bleeding-edge-freeze 
I don't know what I broke
 2013-06-20 23:51:30 -07:00
Spamcat
654a83be9d Quickfix for INFINIMEAT. 2013-06-20 18:13:18 +04:00
Spamcat
2b348eaa3e Phasing out world loops, pt 1 2013-06-20 17:21:16 +04:00
meyar
62de149dc4 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-20 01:51:41 -04:00
Kilakk
516c2697cd Adds auto OOC mute for crew transfer votes 2013-06-19 19:48:03 -04:00
SkyMarshal
73bf813127 Sanity checking for zone disconnection. I am dumb some days. 2013-06-19 12:47:19 -07:00
Jim "Apples"
8b50deb13f Merge pull request #3054 from comma/manup 
Manup
 2013-06-19 09:55:22 -07:00
Jim Apples
a23e1c7a92 Added 5 barsigns. 
Signed-off-by: Jim Apples <cheeckan@gmail.com>
 2013-06-19 17:51:41 +01:00
Chinsky
fac34d5217 Merge pull request #3100 from EmperorJon/master 
Ion Storm Law Change
 2013-06-19 08:48:53 -07:00
Spamcat
2624abdaba Secbelts now can hold melee weapons. 2013-06-19 15:08:55 +04:00
Chinsky
36c08d9fd0 Merge pull request #3084 from jack-fractal/bleeding-edge-freeze 
Malsquando's Teacup Replacement Sprite
 2013-06-19 01:43:51 -07:00
Zuhayr
5def0eda4c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-19 00:23:23 -07:00
Zuhayr
35b909ef3b Fix for dragging. 2013-06-18 23:39:48 -07:00
jack-fractal
4045df96a5 - renaming existing "tea" icon to hot_coco 
- adding "teacup" icon
- revising icon-state for hot coco and tea
 2013-06-19 00:47:12 -04:00
Zuhayr
63b3e44b5c Bug fixes for embedding/pinning code. 2013-06-18 21:24:26 -07:00
Zuhayr
c451f927fc Using BEF map. 2013-06-18 20:38:25 -07:00
Zuhayr
a668c11935 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-18 20:26:13 -07:00
EmperorJon
4ff64c1190 Changes to some AI Ion Storm Laws. 
Told to do so by Ispil.
 2013-06-19 01:57:38 +01:00
Spamcat
0dfb5a0583 Whoops :/ 2013-06-19 02:58:26 +04:00
Spamcat
6d6becbeed Made hailers emaggable. 2013-06-19 02:35:32 +04:00
Chinsky
a3587dc81d Adds new virology machine - centrifuge. 
Used for extracting virus samples or antibodies.
Accepts only vials.
 2013-06-19 02:33:32 +04:00
Chinsky
960a22ee43 Changes way viruses are stored in mobs. 
Now it's an associative list:
uniqueID - virus datum

Updated most instances to match it.
 2013-06-19 02:28:53 +04:00
Segrain
9a59c967f1 Cyborg update. 2013-06-18 23:49:40 +03:00
Zuhayr
e41c47c52b Fixes #3082. 2013-06-19 00:21:15 -07:00
Chinsky
cb7daa77a6 Merge branch 'bleeding-edge-freeze' into viro 2013-06-18 14:55:59 +04:00
Chinsky
de293c9fc5 Merge pull request #3086 from Mordeth221/patch-3 
Ninja update, Several nerfs and tweaks
 2013-06-18 01:40:28 -07:00
Zuhayr
8f7d2c2c7d Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-17 18:14:23 -07:00
Segrain
aa2ab80f6c Missed a line. 2013-06-18 03:33:56 +03:00
Segrain
6f5cffa753 Better term. 2013-06-18 03:20:34 +03:00
Segrain
eec4606629 Adding removal of electronics out of broken/emagged windoors. 2013-06-18 02:51:53 +03:00
Segrain
dcf984577a Adding construction of req_one_access doors. 2013-06-18 02:47:24 +03:00
Segrain
79d2d57859 Code cleanup. 2013-06-18 02:38:40 +03:00
Segrain
91e1e848f7 Bugfixes for windoor construction. 2013-06-18 02:34:15 +03:00
SkyMarshal
453c0c741c Air alarm improvements. Adds Central Atmos Control and a buffer between server room and station. 
Fixes #3074
Fixes #3069
Fixes #2909
 2013-06-17 15:56:57 -07:00
Mordeth221
a2c2c1fe62 Ninja update, Several nerfs and tweaks 2013-06-17 15:02:14 +01:00
Zuhayr
23c8ae0281 Adjustment to melee weapon embedding, so that axes don't instantly get ripped out of your hands in combat. 2013-06-16 22:33:12 -07:00
Zuhayr
9e369ebf31 Apparently flick() is a thing, thanks Chinsky. 2013-06-16 22:30:30 -07:00
Zuhayr
0ebfa7439b Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-16 13:18:13 -07:00
Zuhayr
94c3c7ef49 Armalis additions, tweaks. 2013-06-16 13:17:20 -07:00
Zuhayr
2f8ef8f455 Minor detective scanner resprite/flashing addition. 2013-06-16 13:14:58 -07:00
Kilakk
13045af61a Adds a crew transfer notice for new players 
Adds the "The station is currently undergoing evacuation procedures"
notice for new people trying to join when there's a crew transfer going
on.
 2013-06-16 12:38:38 -04:00
Kilakk
28152ccb0c Merge remote-tracking branch 'upstream/bleeding-edge-freeze' into bleeding-edge-freeze 2013-06-16 12:10:54 -04:00
Zuhayr
b7c260d6ea Removed some debug strings. 2013-06-16 00:45:03 -07:00
Zuhayr
23299809f6 Armalis sprites, simple animal/mob yank-out verb and embedding. 2013-06-16 00:38:40 -07:00
Chinsky
898da9b310 Moved function of infecting blood samples with viruses to incubator from the cure machine. 2013-06-16 11:31:42 +04:00
Chinsky
6f45ff68c7 Changes to effects: 
fixed indentation in some cases.
added feedback message to disorientation effect.
changed mucus virus transfer to proper proc
 2013-06-16 11:30:47 +04:00
Chinsky
5aa1170bd3 Changed isolator to be able to isolate any virus from sample. 2013-06-16 11:29:18 +04:00