cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 05:02:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,133 Commits 6 Branches 0 Tags
fac34d52170de80f348a9f51e4273e55cee9cac0
Commit Graph

9913 Commits

Author SHA1 Message Date
Chinsky
fac34d5217 Merge pull request #3100 from EmperorJon/master 
Ion Storm Law Change
 2013-06-19 08:48:53 -07: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
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
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
Segrain
9a59c967f1 Cyborg update. 2013-06-18 23:49:40 +03:00
Zuhayr
35b909ef3b Fix for dragging. 2013-06-18 23:39:48 -07: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
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
Albert Iordache
8692d7f697 Merge pull request #3077 from comma/bleeding-edge-freeze 
Added Local OOC verb.
 2013-06-15 04:41:29 -07:00
Chinsky
71e47fcd1c Added Local OOC verb. 
Visible to those in view and all admins.
 2013-06-15 15:36:55 +04:00
Chinsky
5ef5a17701 Merge pull request #3064 from Zuhayr/master 
Projectile pinning, staggering, vox whitelist removal, vox raider spawn verb.
 2013-06-15 00:21:24 -07:00
Zuhayr
5c15ce687c SHUT UP SPAMCAT. Bow fix, vox raider message fix. 2013-06-15 14:18:40 -07:00
Zuhayr
b41b1fc2f3 Armalis simple_animal/sprite. 2013-06-15 04:09:49 -07:00
Zuhayr
b1cac56e9a Merge resolution. 2013-06-15 03:54:22 -07:00
Zuhayr
04be69a0b4 Magboots and gloves for vox, removed a debug string, tweaked vox. 2013-06-14 20:07:16 -07:00
Zuhayr
d0e99a9d58 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-14 20:05:40 -07:00
MisterBook
4ea1e16863 With a brand new spanking BEF pull. 2013-06-14 21:24:28 -05:00
Jim "Apples
9b4841143e Merge pull request #3067 from NicholasDV/enhancementsAndFeatures 
Adds in the Kida
 2013-06-14 21:06:37 -05:00
Zuhayr
e3acd6e728 Minor tweak to previous commit. 2013-06-14 16:38:36 -07:00
Zuhayr
1e1426fa8a Minor vox sprite fix, added vox to Create Admin verb. 2013-06-14 16:36:55 -07:00
Zuhayr
52433df154 Runtime fix (argh) and removal of vox from the station race whitelist. 2013-06-14 13:41:06 -07:00
Zuhayr
030290d3a7 Learn to test compile when using new procs, idiot. 2013-06-14 13:25:20 -07:00
Zuhayr
73d35bcd4f Minor changes/sanity checks in yank-out verb. 2013-06-14 13:17:21 -07:00
Zuhayr
7a19d6165b Projectile shrapnel tweak for ease of forensics identification. 2013-06-14 13:03:03 -07:00
Zuhayr
753129086e Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-14 12:01:56 -07:00
Jim "Apples"
6d1d50ed69 Merge pull request #3067 from NicholasDV/enhancementsAndFeatures 
Adds in the Kida
 2013-06-14 10:33:23 -07:00
Chinsky
d0eaeb89b9 Merge pull request #3070 from Baystation12/master 
Updating BEF with master
 2013-06-14 03:17:39 -07:00
Chinsky
5993ce4be5 Merge pull request #3068 from SkyMarshal/airfixes 
Fixes a runtime involving ZAS zones lose their air datum.  (I have no fucking idea why that happens)
 2013-06-14 02:59:29 -07:00