Commit Graph

7337 Commits

Author SHA1 Message Date
Cael_Aislinn
d38cf3da27 re-enabled alien player's hair and facial hair
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-15 21:43:40 +10:00
Cael_Aislinn
e00a696a40 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 2012-10-15 20:57:54 +10:00
DarkTechnomancer
b99dae5c89 Fixed health analyzers 2012-10-15 02:57:48 -04:00
DarkTechnomancer
a6aa56707a Fixed machine building prompts 2012-10-14 23:05:58 -04:00
Asanadas
840ed30875 Fixed a spelling error in the Jensen HoS coat. Sponsored by tasty Trenchoats.
Signed-off-by: Asanadas <asanadas@hotmail.com>
2012-10-14 15:04:00 -04:00
Asanadas
1fcaf5b376 Nerf cheap lighters.
Signed-off-by: Asanadas <asanadas@hotmail.com>
2012-10-14 14:42:08 -04:00
Cael_Aislinn
d5a4a268d7 moved mod panel to a new file, removed the admin stuff from it
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-14 14:31:45 +10:00
Cael_Aislinn
4e08f61642 made the alien player limit a config option
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-14 13:59:50 +10:00
headswe
10f32d1351 Merge pull request #1760 from DarkTechnomancer/master
Fixed flavor text
2012-10-13 20:10:18 -07:00
DarkTechnomancer
4bf6833a62 Fixed flavor text 2012-10-13 19:27:43 -04:00
headswe
c04c26fa29 Merge pull request #1759 from headswe/master
Fixed Organspam (Maybe)
2012-10-13 15:44:42 -07:00
Head
085d357b4b Hopefully fixed organ spam. 2012-10-14 00:43:23 +02:00
Mloc
c03977ba96 Fixed NT's status. 2012-10-13 23:12:59 +02:00
cib
415e1c47d9 Made nudge.py script location configurable. 2012-10-13 11:11:57 -07:00
cib
c747e5e56e Chloral hydrate and sleep toxin now have a small delay before taking effect. 2012-10-13 10:51:08 -07:00
cib
d5ffce8e25 Fixed a bug with blood drips being limited to 1 per turf rather than 3. 2012-10-13 10:31:37 -07:00
cib
0b5a06f3e3 Removed pointless ORGAN_BANDAGED flag. 2012-10-13 10:11:02 -07:00
cib
160328741e Made the human/drip() proc produce larger pools. 2012-10-13 10:08:12 -07:00
cib
31093ce666 More messages for low blood. 2012-10-13 09:59:17 -07:00
cib
e77afd5ab9 Added bleeding and blood transfusion. 2012-10-13 09:45:33 -07:00
cib
4f1d301880 Examine now only reveals you're dead by checking pulse. 2012-10-13 08:57:03 -07:00
cib
46f2864cd3 Ported BS12 player info system. 2012-10-13 08:34:45 -07:00
cib
eeb201123f Merge branch 'master' of github.com:Baystation12/Baystation12 2012-10-13 07:29:43 -07:00
cib
f0e33d09e9 Added a joke item scalpel. 2012-10-13 07:13:18 -07:00
headswe
2326abe31b Merge pull request #1754 from Whitellama/master
Ports/Fixes for the merge!
2012-10-13 07:00:40 -07:00
cib
98386354bb Fixed a bug in radio code where it would expect the user to be a human. 2012-10-13 06:37:18 -07:00
cib
9c55f8c8ac Ported BS12 medbots. 2012-10-13 06:33:05 -07:00
cib
8dc75dfa3c Fixed the problem where :h would be holosay even for cyborgs. 2012-10-13 05:46:09 -07:00
cib
5a1df1362a Medical stacks(bandages etc.) now are non-instant again. 2012-10-13 05:45:15 -07:00
Travis Whitehead
5184ca58f5 Roller beds are collapsible and the ChemMaster lets you specify pill/bottle color, once more 2012-10-13 03:44:19 -07:00
Travis Whitehead
524265b872 Fixed Moderator text color in OOC + Mods no longer see admin logs 2012-10-13 03:39:33 -07:00
cib
9ae4bbfdf8 Fixes the say_quote runtime. 2012-10-12 16:15:34 -07:00
cib
c0e0e7d116 Remove the silly examine messages that give away wounds even when under clothing. 2012-10-12 15:47:01 -07:00
cib
c691f76c65 Small bug with engineering cyborg radio channels. 2012-10-12 15:34:40 -07:00
cib
e05b9fa2b6 Fixed a runtime with organ generation. 2012-10-12 15:03:32 -07:00
cib
06d47ea2dd Cyborgs can now use their respective channel. 2012-10-12 14:56:34 -07:00
cib
32e839f683 More and yet more fixes from the piratepad.
- AI laws now default to Nanotrasen laws
- Removed half the random events
- Milk now in chem dispensers
- Hunger rate decreased by half
2012-10-12 14:25:54 -07:00
cib
5ef6399238 Fixed a ton of the issues in http://piratepad.net/9CwFobI4lZ 2012-10-12 13:58:18 -07:00
cib
89263fc9f6 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-10-12 13:19:20 -07:00
cib
8c157bff18 Added missing groin. 2012-10-12 12:36:25 -07:00
Mloc
046348db49 Merge pull request #1744 from CIB/branch
Several changes to organs + bugfix
2012-10-12 12:15:57 -07:00
cib
99313f5a94 More fixes to wounds.
- Added more wound descriptions
- Wounds now have "bleeding" and "bandaged" in their examine description
2012-10-12 12:08:00 -07:00
cib
0aa3bde885 Fixed the problem where you don't get the game-panel verb. 2012-10-12 11:41:01 -07:00
cib
70740d20c6 Improved the organ and wound system.
- Removed a few unnecessary things in organ.take_damage
- Wounds now will open a lot more often, making for fewer but larger wounds
- Natural wound regeneration will use less processing time now by happening less often
2012-10-12 11:38:59 -07:00
cib
fbc903e59c Added a new surgery system. 2012-10-12 11:09:21 -07:00
Mloc
d4a67a7e66 Merge pull request #1741 from caelaislinn/bs12_with_tgport
re-add asay >.>
2012-10-12 09:43:08 -07:00
Mloc
33a3d3cd97 Merge pull request #1738 from CIB/master
Dismemberment
2012-10-12 09:42:31 -07:00
Cael_Aislinn
d59dc63fed re-add asay >.>
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-13 01:37:08 +10:00
Cael_Aislinn
a0c91e200d re-added missing admin verbs (bans, toggle ooc, msay etc)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-13 00:51:30 +10:00
Cael_Aislinn
3e11992cce re-added game panel for admins and added zas options, extended postgame restart delay from 25 seconds to 60
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-13 00:01:45 +10:00