cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-21 11:06:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,682 Commits 66 Branches 25 Tags
d477b7230fa161a22ab71aa2bc4aa6ce7e2fdbbc
Commit Graph
11682 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Cael_Aislinn d477b7230f reworked rust components to integrate more smoothly with each other, cleaned up a bunch of useability issues, made all relevant components portable, fixed some random bugs, added a mostly nonfunctional map to show an example layout (based on antiqua's engineering layout) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-22 16:39:42 +10:00
Cael_Aislinn 8cd47739d2 removed event debug string, bumped up minimum event interval, tweak to space carp 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-19 14:04:33 +10:00
Chinsky e9981b91ec Merge pull request #2369 from Gamerofthegame/bleeding-edge-freeze 
Minor map fix, ERT-debug
 2013-02-17 21:15:33 -08:00
Gamerofthegame 437cca538b Merge branch 'bleeding-edge-freeze' of https://github.com/Gamerofthegame/Baystation12 into bleeding-edge-freeze 2013-02-18 00:07:40 -05:00
Chinsky 3d0f43cd7f Merge pull request #2368 from caelaislinn/bleeding-edge-freeze 
Issue resolutions, cleanups and tweaks
 2013-02-17 19:12:21 -08:00
Cael_Aislinn 24763f8bb0 removed debug output, cleanup of alien languages, bumped tajaran darkseeing 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-18 13:07:01 +10:00
Cael_Aislinn 2b4827692c tweakfixes to admin PMs 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-18 13:06:07 +10:00
Cael_Aislinn 6918fb0ef9 new crew manifest for id computers, tweaks to manifest to better fit window, renamed roboticist alt title post-feedback 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-18 12:56:57 +10:00
Gamerofthegame 64c72ef969 Adds the ERT to the debug command for adminnery. Not exactly like the pre-merge one, as that was based off something else so I couldn't copy-paste. It should give admins a easier time of making things up, though, and so long as future plans go into effect a admin ought to be able to do it on the fly in less then a minute. 2013-02-17 18:15:07 -05:00
Gamerofthegame f80a3de083 Adds air tight flaps to disposals, Medical door to medical hardsuits and adds the NT standard lawset to the upload that was, in fact, just sitting around waiting to be placed in the map. Go figure. 2013-02-17 17:33:28 -05:00
Chinsky 4bffef5f90 Merge pull request #2358 from caelaislinn/bleeding-edge-freeze 
Misc small stuff (don't merge yet)
 2013-02-17 08:02:15 -08:00
Cael_Aislinn 844d9e7e89 changelog update 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-18 01:27:54 +10:00
Cael_Aislinn fea6635060 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	code/game/verbs/who.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-18 01:25:47 +10:00
Hawk-v3 1db852f86a Merge pull request #2357 from comma/master 
Fixes and bandages.
 2013-02-17 07:16:32 -08:00
Cael_Aislinn c4176beb3e some more useability tweaks to adminwho/modwho 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-18 00:56:53 +10:00
Cael_Aislinn da9b87a288 beepsky now fights hostile NPC mobs, and vice versa 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-18 00:32:49 +10:00
Chinsky 0b8bae86ae Only bandaging bleeding wounds would cause itching. Bruise packs give out different message during treatment depending on type and severity of wound. 2013-02-17 18:31:14 +04:00
Chinsky 948e859d80 Fixes #2343 (and #2342), #2356 Readded pre-merge bottle and pill icon choosing system. 2013-02-17 18:31:03 +04:00
Chinsky 5c13beaf59 Fixed issue #2341 2013-02-17 17:57:23 +04:00
Chinsky 0cb4e29a4a Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-02-17 17:51:09 +04:00
Chinsky a68e5d3875 Merge pull request #2333 from Baystation12/BEF-staging 
Merge on the 16th if no issues
 2013-02-17 04:44:25 -08:00
Chinsky c8eb7cb306 Merge pull request #2351 from CIB/BEF-staging 
Balance fixes to medical side-effects.
 2013-02-17 02:54:09 -08:00
Cael_Aislinn 4b69afd15b made carp migration actually end (carp disappear back into the void) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-17 11:17:45 +10:00
Cael_Aislinn cabc70398b added some info text to adminwho/modwho 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-17 11:12:17 +10:00
Chinsky 7a94494eee Merge pull request #2354 from Zuhayr/master 
Posibrain fixes (double name, protolathe, double binary)
 2013-02-16 02:22:47 -08:00
Zuhayr 4dd7141e32 Removing a debug string. 2013-02-16 16:19:39 -08:00
Zuhayr 6ad09d49c8 Fixes for posibrain name generation, research design for protolathe, possible for for double-say for posibrains (cannot test locally). 2013-02-16 14:21:00 -08:00
Christian Bielert 9d2ed2e900 Merge pull request #2348 from Gamerofthegame/bleeding-edge-freeze 
Secret-Nuke playerlimit raised
 2013-02-15 05:45:31 -08:00
cib eaa8130672 Balance fixes to medical side-effects. 
- Bandage/ointment now causes itch instead of cramps
- Reduced amount of messages/effects by side-effects to 1/3
- Side-effects will now disappear after a while if left untreated, but they will cause damage before that.
 2013-02-15 14:25:11 +01:00
Gamerofthegame 5030a1d872 Merge branch 'bleeding-edge-freeze' of https://github.com/Gamerofthegame/Baystation12 into bleeding-edge-freeze 2013-02-14 22:53:48 -05:00
Gamerofthegame 713176a466 Changes Secret-Nuke ready requirements from 15 to 25. 2013-02-14 22:50:01 -05:00
Gamerofthegame 6f0607cf12 Merge pull request #4 from Baystation12/bleeding-edge-freeze 
Bleeding edge freeze
 2013-02-14 19:45:12 -08:00
Chinsky ecc8cfc433 Merge pull request #2339 from CIB/feature 
Virologist is an alt title again.
 2013-02-14 14:15:38 -08:00
Chinsky d97fced4f3 Merge pull request #2340 from CIB/BEF-staging 
Updated changelog.
 2013-02-14 14:13:44 -08:00
cib afccc33ddb Forgot to give MD virology access. 2013-02-14 23:13:18 +01:00
Chinsky 9f46a5c6c2 Merge pull request #2338 from CIB/master 
Bugfix
 2013-02-14 14:07:21 -08:00
Chinsky 8b8556a1b1 Removed requirements for face surgery to cut open head too, real counterintuitive and looks like copypaste error >.> 2013-02-15 02:06:35 +04:00
cib e14855be35 Updated changelog. 2013-02-14 17:20:04 +01:00
cib 1c341af3e9 Merge branch 'feature' of github.com:CIB/Baystation12 into feature 2013-02-14 16:30:29 +01:00
cib 484c936c6d Fixed a bug with intercept reports. 2013-02-14 16:29:07 +01:00
cib de998e2780 Hotfix: Update the .dme 
The FILE_DIR entries were missing, which makes it impossible to compile the game using linux' DreamMaker CLI command(The CLI command doesn't rebuild the directories like the IDE does).
 2013-02-14 15:52:36 +01:00
cib 644e309594 Virologist is an alt title again. 2013-02-14 15:36:06 +01:00
cib c5301c5144 Fixes issue #2296: Humans will not react to sleep toxins in smaller amounts than can be scrubbed. 2013-02-14 15:06:10 +01:00
cib 5217227f9a Fixes issue #2309: Infected blood now infects again. 2013-02-14 14:45:52 +01:00
Christian Bielert 9c8c4c0a89 Merge pull request #2337 from Baystation12/bleeding-edge-freeze 
Update staging
 2013-02-14 05:40:02 -08:00
Christian Bielert b540ebe0b3 Merge pull request #2304 from caelaislinn/bleeding-edge-freeze 
Merge from master, issue resolutions / mapfixes, events updates, admin updates
 2013-02-14 05:22:05 -08:00
Cael_Aislinn ff222c2f13 fixed biomass/spacevine spawning, tweaked event probabilities, made aliens default to disabled as a random event 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-14 23:17:54 +10:00
Cael_Aislinn d1e6e342c5 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-14 22:10:02 +10:00
cib 5b6fd2de48 Merge branch 'master' of github.com:Baystation12/Baystation12 into BEF 2013-02-14 13:05:37 +01:00
cib 4c49e51182 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into BEF 2013-02-14 13:05:27 +01:00