Commit Graph

17074 Commits

Author SHA1 Message Date
Mloc 82eb19df9a Merge pull request #3493 from Zuhayr/master
Click delay fixes (part 1)
2013-08-12 05:58:46 -07:00
Erthilo 9d1bbb16d0 Adds explosive implant admin messages, and jump button for explosions. 2013-08-12 12:34:13 +01:00
Zuhayr b3e184ad0a Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-12 00:10:12 -07:00
Zuhayr b65543e78c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2013-08-12 00:09:25 -07:00
Zuhayr eec6c16de6 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2013-08-12 00:09:17 -07:00
ZomgPonies c00c377d76 Re-adding clown/mime 2013-08-12 02:04:08 -04:00
ZomgPonies c1272238e7 Revert "Revert "Moving files around to make code changes more modular from base BS12""
This reverts commit 79ff9683496a1e94b2b7cfff09234606d668b5ee.
2013-08-12 02:04:07 -04:00
ZomgPonies 916256b400 Revert "Moving files around to make code changes more modular from base BS12"
This reverts commit f0473c4abd99e66fd9f4225567f23ae89e354e2c.
2013-08-12 02:04:07 -04:00
ZomgPonies 17d0a2232b Moving files around to make code changes more modular from base BS12 2013-08-12 02:04:07 -04:00
ZomgPonies e3213894bd Items missing from map re-added. 2013-08-12 02:04:06 -04:00
ZomgPonies d752da826e Karma System, 1st iteration 2013-08-12 02:04:05 -04:00
Zuhayr e748fdeb0c Merge pull request #3488 from Baystation12/dev-freeze
Dev freeze
2013-08-11 22:00:01 -07:00
Zuhayr bcad5a787d Fixed listing of unrelated creatures when infesting. 2013-08-12 14:46:03 -07:00
Zuhayr 5ecee57a2c Fixed failure to remove borer verbs on successful resist. 2013-08-12 14:45:42 -07:00
Zuhayr b23c685221 Borer surgery fix. 2013-08-12 13:44:51 -07:00
Zuhayr 5f0515fb50 Further borer tweaks. 2013-08-12 13:36:21 -07:00
Zuhayr 16e976035f Cortical borer fixes. 2013-08-12 11:50:14 -07:00
Segrain eb55fb2da2 Revive fix. 2013-08-12 05:30:39 +03:00
Zuhayr 375437a6cf Changelog merge. I hate the changelog. 2013-08-12 11:20:41 -07:00
Erthilo 459aafd523 Fixed borg sprites no resetting with reset board. 2013-08-11 21:32:02 +01:00
Erthilo 166a7e57a6 Cult 'raise' rune how completely heals raised corpse. 2013-08-11 17:38:12 +01:00
Erthilo 070cb50f8d PDAs can be used when buckled (and not in any other way restrained or stunned). Rejuvenate now completely heals a target or broken organs and viruses too. 2013-08-11 17:13:58 +01:00
Mloc-Argent 7ba1638e11 Fixed some mob clicks.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-08-11 15:52:48 +01:00
Zuhayr 29ad858ed4 Fixes the weird inertia behavior of cuffed/dragged people in space. 2013-08-11 23:52:46 -07:00
Mloc 7e00df0a56 Merge pull request #3473 from Zuhayr/master
Commented out gold slime core reactions.
2013-08-11 06:34:38 -07:00
PlasticDingus 672a810f44 New decorative object
So having gotten a (weak) grasp of Git and and creating objects, I'm
submitting my first commit. It's a simple potted plant decorative
object.

If there's something wrong, please let me know. I'm still quite new to
contributing to the game.
2013-08-11 02:49:02 -04:00
Zuhayr e04a5a6ce6 Added language name to speech. 2013-08-10 22:57:36 -07:00
Segrain 935a7f30ea Typo fix. 2013-08-11 09:22:20 +03:00
Zuhayr a8c892a938 Fixes Heist check_antag verb. 2013-08-11 14:03:46 -07:00
Zuhayr 6e81952c20 Moved language flag defines to setup.dm. 2013-08-10 21:00:32 -07:00
Zuhayr bc4ac1d4ee Language choice changes. 2013-08-10 21:00:15 -07:00
Zuhayr 790b384669 Expanding the language list. 2013-08-10 19:39:10 -07:00
Zuhayr 69fd8da6db Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-10 18:30:27 -07:00
Zuhayr 2ce91a3fbc Commented out gold slime core reactions. 2013-08-10 18:19:41 -07:00
Zuhayr 857cce2da5 Brainloss emoting tweak. 2013-08-10 13:22:35 -07:00
Zuhayr 6c266e08e4 Fixed double worms, lowered chance of emoting. 2013-08-10 13:15:30 -07:00
Zuhayr 4c26922e7b Compile fix. 2013-08-10 12:36:23 -07:00
Zuhayr 9ee5d58ca6 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2013-08-10 12:24:33 -07:00
Segrain 1d533de46a Vox limbs. 2013-08-10 06:16:47 +03:00
Zuhayr 23947fd2c8 Added cumulative brainloss for borer infestations. 2013-08-10 01:20:36 -07:00
Zuhayr 4e5a17b94a Lowered age for pod plants. 2013-08-10 00:20:09 -07:00
Zuhayr 02d1a4740f Brainslug language translation for hosts. 2013-08-10 00:17:11 -07:00
Zuhayr c14c74472e Additional cortex borer verbs, reproduction. 2013-08-09 19:40:43 -07:00
Chinsky b259913e10 Merge pull request #3468 from Zuhayr/feature
Removed hair option with missing sprite.
2013-08-09 18:51:08 -07:00
Zuhayr 1146676491 Minor adjustment to release_control() proc. 2013-08-09 18:16:10 -07:00
Zuhayr 7aa8d00e70 Borer removal, control, release of control, host death. 2013-08-09 18:10:55 -07:00
Zuhayr 4a4249fd6e Added cortical borers. 2013-08-09 18:10:18 -07:00
Zuhayr bb06b50177 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-09 13:21:54 -07:00
Zuhayr e00e593988 Removed hair option with missing sprite. 2013-08-09 13:16:47 -07:00
Segrain cfd0e9f7e2 Vox suit sensors. 2013-08-09 07:11:58 +03:00