PsiOmega
2f8bb7e135
Fixes runtime errors. AIs and cyborgs can now attach their photos to newscasters as well as photocopy them.
2014-07-29 15:45:22 +02:00
PsiOmega
a5f6d417a1
Expands the AI photo-camera so that it now has robot/cyborg support. Also implements DRY in practice.
2014-07-28 23:41:55 +02:00
PsiOmega
63ab44accc
Makes it possible for the AI to take and view images.
2014-07-28 17:30:51 +02:00
Zuhayr
ad8ef7c4ab
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-28 20:59:29 +09:30
Zuhayr
da42b20039
Merge pull request #5794 from Loganbacca/cups
...
Cup grammar fix
2014-07-28 10:11:57 +09:30
Zuhayr
11a2b0eb3c
Merge pull request #5792 from Whitellama/flavourtext
...
Dynamic Flavour Text
2014-07-28 10:11:02 +09:30
Loganbacca
4861c5a5d4
Grammar tweak
2014-07-28 07:38:24 +12:00
Mloc
d6caf74e56
Merge pull request #5769 from comma/dev
...
Enables logging of people beating monkey
2014-07-27 12:02:26 +01:00
Chinsky
ed5b05772f
Merge pull request #5777 from Loganbacca/trainfix
...
Cargo train fixes
2014-07-27 14:46:45 +04:00
Chinsky
c9d862b89a
Merge pull request #5783 from Walter0o/master
...
fixes nullpointer caused by broken organ list reading
2014-07-27 14:46:31 +04:00
Loganbacca
fbc9b03e73
Cup fix
...
- Grammar fix for drinking from cups
- Changed "Glass of Tomato juf" to "Glass of Tomato juice" (I'm assuming this was a typo)
2014-07-27 20:04:45 +12:00
Whitellama
0a0c18dbf6
Fixed issue with flavour text saving/loading from other characters
2014-07-26 18:50:34 -07:00
Chinsky
5fe8865f95
Merge pull request #5771 from JimTheCactus/name_fix
...
Added check for blank on name entry
2014-07-27 05:04:05 +04:00
Whitellama
eb64769734
Cleaned up mistake implementing dynamic flavour text
2014-07-26 17:41:03 -07:00
Whitellama
8f1417f14c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into flavourtext
2014-07-26 17:09:12 -07:00
Whitellama
0528675846
Added dynamic flavour text, where covered bodyparts' flavour isn't displayed
2014-07-26 17:08:55 -07:00
Whitellama
425dfd2a6e
Fixed issue with recognizing covered jumpsuit and gloves
2014-07-26 17:07:34 -07:00
Whitellama
bbc9150793
Updated body_parts_covered
2014-07-26 17:06:08 -07:00
JimTheCactus
0b7e858000
Changes check to an isnull rather than a truth test
...
This allows the client to detect the difference between a blank and someone pressing cancel.
2014-07-26 16:19:14 -06:00
Zuhayr
e5eb9cc496
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hydroponics
2014-07-27 03:24:27 +09:30
Zuhayr
dc10f92ad1
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics
2014-07-27 03:23:35 +09:30
Zuhayr
4ef8a08310
Added portable_atmospherics to hydroponics machine path, couple of other tweaks.
2014-07-27 03:20:16 +09:30
Zuhayr
976cb4f844
Fixed seeds not showing up properly in the vendor.
2014-07-27 03:19:43 +09:30
Mloc-Hibernia
a2dc7b827b
Merge remote-tracking branch 'upstream/pr/5689' into dev
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
Conflicts:
code/game/machinery/computer/crew.dm
2014-07-26 14:25:24 +00:00
Chinsky
c34cf89a04
Merge pull request #5784 from Jarcolr/patch-3
...
Fixes #5691
2014-07-26 17:18:38 +04:00
Jarcolr
9e233f1597
Fixes #5691
...
Chef >> Chefhat
2014-07-26 13:41:43 +03:00
Walter0o
23811e7e5c
fixes nullpointer caused by broken organ list
...
the mysterious broken list bug has struck again
2014-07-26 11:54:32 +02:00
Jarcolr
17f86962ac
Fixes #5773
...
Added /obj/item/weapon/FixOVein to surgery cyborg modules.
2014-07-26 12:50:41 +03:00
Zuhayr
bc25cca7a9
Merge branch 'hydroponics' of https://github.com/Zuhayr/Baystation12 into hydroponics
2014-07-26 15:45:26 +09:30
Zuhayr
5a108b2d05
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hydroponics
2014-07-26 15:40:28 +09:30
Zuhayr
efe1c2feb2
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into hydroponics
2014-07-26 15:39:25 +09:30
Loganbacca
99f755b986
Cargo train fixes
...
- Adds overlay for cargo tug sprite
- Fixes failure feedback when successfully loading items on the train
- Stopped unnecessary loading failure feedback (like loading floors on trains, which will always fail)
- Stopped "hit" message when relabeling with the hand labeler
2014-07-26 17:55:30 +12:00
DJSnapshot
d4ce124fe0
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hotfix
2014-07-25 19:37:10 -07:00
DJSnapshot
9be6de1e77
fixes admin show-skills verb.
2014-07-25 19:34:13 -07:00
JimTheCactus
b0db2ba347
Added check for blank on name entry
...
Since cancel just returns a blank this checks for that and doesn't raise an error.
2014-07-25 19:36:58 -06:00
DJSnapshot
de282a4e2a
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/client/preferences.dm
2014-07-25 17:19:59 -07:00
Chinsky
1e1d5a6d01
Enables logging of people beating monkey.
...
Also updates it to species code and visible message helper. Shit is anicent.
2014-07-26 04:09:20 +04:00
Chinsky
f33e11383b
Merge pull request #5751 from DJSnapshot/hotfix
...
Bug Fixes!
2014-07-26 03:28:54 +04:00
Zuhayr
69b397b5c4
Compile fix.
2014-07-26 01:42:05 +09:30
Zuhayr
b32bbf8d2c
Merge pull request #5741 from mwerezak/wound-infections
...
Attempts to prevent ninja infections, body temperature fix, icon fix
2014-07-26 01:30:12 +09:30
Zuhayr
d8336061b4
Merge branch 'hydroponics-pr' of https://github.com/Zuhayr/Baystation12 into dev
2014-07-25 23:02:21 +09:30
Zuhayr
5da36d265e
Merge resolution with PDA nanoui.
2014-07-25 22:57:53 +09:30
Zuhayr
57b790ad92
Merging.
2014-07-25 22:50:35 +09:30
Zuhayr
ea8b08c49b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics
2014-07-25 22:34:40 +09:30
Zuhayr
4d1812ba2b
Hydroponics rewrite, details will be in PR. Big commit.
2014-07-25 22:16:04 +09:30
Zuhayr
7fb8f30cc7
New machines, adjusted Cael's seeds, rewrote space vines.
2014-07-25 22:15:33 +09:30
DJSnapshot
2c7bb6c48d
Remerged Siik'maas and siik'tajr together as per the tajara maintainer's request.
2014-07-24 17:01:52 -07:00
Loganbacca
31fe0d5e34
Cargo train fixes
...
- Visual tweak for mobs on trolleys
- Fixed a teleportation bug when boarding trains from other trains
- Fixed a runtime involving on_click code
2014-07-24 20:14:58 +12:00
Loganbacca
1b1e4bc118
Cargo train update
...
- Adds sprites (thanks to Bishop)
- Adds order-able train cargo crates
2014-07-24 18:01:10 +12:00
DJSnapshot
bb336b7691
temporary fix for #4907
2014-07-23 21:48:32 -07:00
