RKF45
9b62f7b23d
Small fixes, again
2014-01-04 21:26:28 +01:00
RKF45
9b2ff51486
Merge remote-tracking branch 'upstream/dev'
2014-01-04 19:41:19 +01:00
Fira
354b1978ea
Partial fix for pAI emotes (they still can't hear beyond one container
...
level, will require a say/emote code hack)
2014-01-04 15:22:17 +01:00
Fira
ed5307abd0
Added Air Analyser verb for ghosts to spy on supermatter and atmos
2014-01-04 12:27:07 +01:00
Fira
de7c480439
Added GhostRadio -- Allowing ghosts to spy on radio from anywhere
2014-01-04 12:25:09 +01:00
Ccomp5950
ad740b9397
Merge pull request #4198 from Zuhayr/dev
...
Diona nymphs are now wearable.
2014-01-03 19:33:54 -08:00
Zuhayr
7005a66d5b
Fix for containers getting left behind when nymphs grow.
2014-01-04 13:28:32 +10:30
Zuhayr
fa2b6fa6b4
Couple of oversights with diona.
2014-01-04 13:23:59 +10:30
Zuhayr
47dda54a72
Forgot SLOT_HEAD.
2014-01-04 12:53:51 +10:30
Zuhayr
f2300725f7
Made it possible to pick up and wear diona nymphs.
2014-01-04 12:49:55 +10:30
Zuhayr
122f5854d6
Fix for oversight of dionaea needing to breathe.
2014-01-04 12:49:15 +10:30
Mark Aherne (Faerdan)
fa085705ab
Updated NanoUI's nanomanager with update_user_uis and close_user_uis procs. These procs allow you to update and close uis for a specific user and optionally a specific src_object and/or ui_key.
...
An example of where the update_user_uis proc will be used is in updating any open PDA UIs for users when sending or receiving messages.
Added a link to the new NanoUI wiki page in the TemplatesGuide.txt file.
2014-01-04 02:09:35 +00:00
Zuhayr
62893f80b6
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-04 11:35:07 +10:30
Mark Aherne (Faerdan)
a99a7c3dca
Fixes/tweaks for NanoUI. These were made by TG coders, so I'm just adding them here.
...
* Transfer open ui instances when transferring a user to another mob
* Runtime fixes in the NanoUI Topic and nanoclose client verb
* Return focus to the map when a NanoUI is opened
2014-01-03 23:58:44 +00:00
Mloc
08678a9e3e
Merge pull request #4186 from Ccomp5950/kick_reason
...
Admins can now put a reason for booting someone from the server.
2014-01-03 03:42:59 -08:00
Zuhayr
1a4e8fafe2
Merge pull request #4183 from Iamgoofball/cookie
...
Made cookies able to be baked in the microwave.
2014-01-03 03:27:57 -08:00
Ccomp5950
ea32e235ab
Admins can now put a reason for booting someone from the server.
...
Virgie requested feature.
2014-01-03 01:09:06 -06:00
Iamgoofball
a4536a3e90
Made cookies able to be baked in the microwave
2014-01-02 17:15:34 -08:00
DJSnapshot
2949c2f675
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-01-02 16:56:38 -08:00
Zuhayr
2c492d8289
Using DNA2 files from master.
2014-01-03 11:19:40 +10:30
Zuhayr
f679776a22
Made diona nymph evolution whitelisted.
2014-01-03 09:37:13 +10:30
RKF45
861d98797f
Merge remote-tracking branch 'upstream/master'
2014-01-01 22:28:31 +01:00
RKF45
86334cbee2
I have no idea what I'm doing D:
2014-01-01 17:03:02 +01:00
Zuhayr
37d96ebc80
Nerfs abandoned crates to be less fucking moronic.
2014-01-02 00:42:11 +10:30
Zuhayr
1cddbeb180
Fix for ninja being unable to wear full-sized oxytanks.
2014-01-01 22:10:25 +10:30
Zuhayr
f638f1db96
Prevented the ability to open locked crates with random items.
2014-01-01 21:33:23 +10:30
Zuhayr
b6af4a1b4e
Removes mime and HONK carts from protolathe.
2014-01-01 21:26:19 +10:30
DJSnapshot
b294174acb
Openable soda cans and beer bottles!
2013-12-31 17:52:12 -08:00
Zuhayr
56c967c250
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2013-12-31 21:24:03 +10:30
LightningIron
5007133848
Merge remote-tracking branch 'upstream/master'
2013-12-30 22:07:18 -06:00
DJSnapshot
7a7eca4393
Merge pull request #4146 from Baystation12/dev-freeze
...
Dev-freeze --> Master staging [Going live!]
2013-12-30 13:52:21 -08:00
Zuhayr
df6bd5d6c8
Gib rewrite/resprite to allow for arbitrary blood and flesh colours.
2013-12-30 21:48:34 +10:30
Zuhayr
f20a843496
Merge pull request #4142 from Ccomp5950/pda_optimizations
...
Optimizations of PDA NanoUI
2013-12-29 16:06:29 -08:00
Ccomp5950
f14c46cc9c
PDA NanoUI spam event update.
...
Since PDA's track conversations now we won't have a PDA for spam (we could always create a dummy object for it in the future)
So we don't want it adding to tnote. Popping up on the players chat is fine for now.
2013-12-28 20:56:06 -06:00
Zuhayr
5313851da9
Converted robots over to current blood system/paths, updated various files to work with update.
2013-12-29 02:48:20 +10:30
Zuhayr
be14eb8781
Minor hand blood overlay fix.
2013-12-29 00:34:03 +10:30
Zuhayr
01dd4373d0
Minor bugfix with blood painting code.
2013-12-29 00:11:21 +10:30
Zuhayr
46bf56f38a
Wrong var in ghost writer toggle.
2013-12-29 00:03:45 +10:30
Zuhayr
26de46ae4b
Added ghost writing proc to mob/dead.
2013-12-28 23:59:47 +10:30
Zuhayr
85ad2363c4
Added config toggle for ghost writing (for adminbus).
2013-12-28 23:53:20 +10:30
Zuhayr
6888651da6
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2013-12-28 23:14:43 +10:30
Zuhayr
c6c1a575d6
Merge of blood file, ammo icons, map. Manual binary file merge incoming.
2013-12-28 23:13:04 +10:30
Chinsky
3f3ae1fad6
Rocket launchers shouldn't probably fit on belt
2013-12-28 16:25:49 +04:00
DJSnapshot
eeeae3d285
fixes because Sue is silly.
2013-12-27 20:23:44 -08:00
DJSnapshot
1f5e278aa6
Added Sue's new weapon code and sprites.
2013-12-27 16:44:44 -08:00
Zuhayr
20b6e6fecf
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-12-27 17:48:41 +10:30
SkyMarshal
30970b7b56
Hypothetically adds proximity check to droppers.
...
This code is awful, but it appears "flag" (who names this shit?) acts as a proximity check.
2013-12-26 21:22:00 -07:00
Zuhayr
183afc61bf
Reverts corgi dress-up due to being terrible and duplicating items.
2013-12-27 11:06:20 +10:30
Zuhayr
b638388bdd
Uncommented ninja block in Check Antags.
2013-12-27 10:48:37 +10:30
Zuhayr
661593718f
Using dev-freeze map.
2013-12-27 10:42:13 +10:30
