cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,436 Commits 9 Branches 0 Tags
0cfaf8e70b51b46b15e82a3839ee0c7400bb6537
Commit Graph

5688 Commits

Author SHA1 Message Date
Zuhayr
7389d843fc Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-21 18:06:49 -07:00
Zuhayr
a16c8e0595 Fixes #3081 2013-06-21 18:00:25 -07:00
Zuhayr
f38865f0de Added a dart gun and sprites. 2013-06-21 06:01:39 -07:00
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
Zuhayr
1b5b035630 Fixes #2421 2013-06-21 15:38:44 -07:00
Spamcat
2b348eaa3e Phasing out world loops, pt 1 2013-06-20 17:21:16 +04:00
Jim "Apples"
8b50deb13f Merge pull request #3054 from comma/manup 
Manup
 2013-06-19 09:55:22 -07:00
Chinsky
fac34d5217 Merge pull request #3100 from EmperorJon/master 
Ion Storm Law Change
 2013-06-19 08:48:53 -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
EmperorJon
4ff64c1190 Changes to some AI Ion Storm Laws. 
Told to do so by Ispil.
 2013-06-19 01:57:38 +01: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
Zuhayr
8f7d2c2c7d Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-17 18:14:23 -07: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
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
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
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
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
Jamini
89766706fe Alien Monkeys - Farwa, Stok, Aenera 
Signed-off-by: Jamini <mobiousjami@gmail.com>
 2013-06-14 02:22:27 -04:00
Zuhayr
b30b156950 Melee embedding fix. 2013-06-13 22:59:13 -07:00
Zuhayr
3cb36272cb Adjusted yank verb to apply to others as well as yourself. 2013-06-13 22:18:26 -07:00
NicholasDV
9139a70d8c Adds in the icon files for Kidan and fixes issue 
SkyMarshal caught a small issue, and I realized that I never did
include the kidan icon files. This is the fix!
 2013-06-14 00:06:45 -04:00
Zuhayr
6b73b8ec2f Adjusted kitchen knives. Added projectile pinning. Various tweaks. 2013-06-13 20:46:09 -07:00
Zuhayr
1b230504f5 Runtime fix. 2013-06-13 15:57:41 -07:00
Zuhayr
4aa577bef3 Powered crossbows, sprites, ammo. 2013-06-13 15:31:47 -07:00
NicholasDV
a2fddc0fc1 Adds in the Kida 
Adds in the Kida Race to all parts.
 2013-06-13 18:22:05 -04:00
Zuhayr
4928f56030 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-13 12:03:58 -07:00
Asanadas
7479fd272c Added Malsquando's colored suit to the hop's wardrobe locker. 
Everything should be working correctly.
 2013-06-13 09:41:52 -04:00
meyar
90e477ebfb Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-12 17:24:54 -04:00