45947bb9f5
Addresses Zuh's issues so he'll stop wracking me.
2015-04-09 21:22:04 -04:00
990530d118
Ports /vg/'s spell system for the sake of cult porting.
...
Does offer a much more pleasant basis to work with in the future, if someone wishes to add more spell-like abilities.
2015-04-09 20:08:06 +02:00
2f8bc856a5
Small fix after merge
2015-04-09 21:07:43 +03:00
4784dd8f95
Fixes dough and synthmeat recipes to correctly generate multiple products
...
Fixes #8786
2015-04-09 16:28:06 +01:00
b35fe67be8
Fixes robot Life() runtime
...
Fixes #8610
2015-04-09 16:08:33 +01:00
9bd93dbb29
Removes duplicate virus food recipe, adjusts correct recipe
...
Fixes #8590
2015-04-09 16:01:19 +01:00
a377806b47
Fixes PACMAN UI initial data
...
Fixes #8561
2015-04-09 15:58:07 +01:00
7483b9fcb2
Fixes hardsuits completely breaking all the time
2015-04-09 13:58:10 +01:00
e6f83f8fa2
Merge pull request #8707 from PsiOmegaDelta/Garbage
...
Ports /vg/&/tg/'s garbage collector.
2015-04-09 08:50:12 +03:00
7b15bd59e5
Merge pull request #8768 from Yoshax/emergencymessage
...
Emergency message changes
2015-04-09 08:15:19 +03:00
6699cab7bf
Adds selectable default languages to all mobs which can speak
...
Set-Default-Language verb to set, Check-Default-Language verb to check
There are also links to set and reset in Check-Known-Languages
2015-04-08 15:18:59 +01:00
71a8ddf50e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/modules/paperwork/paper.dm
code/modules/projectiles/projectile.dm
2015-04-08 10:55:26 +02:00
66c56926d0
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/gamemodes/cult/runes.dm
2015-04-08 10:40:38 +02:00
fe0185697e
Some dislocation fixes/adjustments.
2015-04-07 19:50:26 -07:00
cee229733e
Merge branch 'dev' of https://github.com/Zuhayr/Baystation12 into dev
2015-04-07 18:38:59 -07:00
d683bb07af
Allows dislocating joints using a neck grab + disarm
2015-04-07 15:46:42 -04:00
81bcad2b33
attackhand cleanup
2015-04-07 15:12:32 -04:00
175fdf57e6
Merge pull request #8703 from PsiOmegaDelta/Map
...
Area/Camera network refactor - Part 1
2015-04-07 21:41:06 +03:00
6482dfb374
EFTPOS scanners now work with IDs in PDAs and wallets
...
Vending machine code revised slightly
"\the" added to visible messages where applicable
2015-04-07 22:09:11 +10:00
177d968933
Changes flour sacks to a condiment, so that players will be able to pour flour straight into beakers, instead of having to use the grinder first.
2015-04-06 18:40:11 -04:00
d78ae0d509
Merge branch 'aiemergencymessage' into emergencymessage
2015-04-06 20:19:27 +01:00
5a34b1481b
Big emergency message changes
2015-04-06 20:17:18 +01:00
4a897e47b9
Merge pull request #8641 from PsiOmegaDelta/CultVisualNetwork
...
Cult Visual network
2015-04-06 20:19:49 +03:00
cbfa0ef0e8
Merge pull request #8759 from PsiOmegaDelta/NewThermals
...
Thermal/NVG changes.
2015-04-06 20:14:39 +03:00
91d4a3482f
Merge pull request #8750 from volas/paper
...
Additional checks for paper work
2015-04-06 20:13:34 +03:00
fd1b6343f0
Merge pull request #8655 from volas/sanitize_procs2
...
sanitize(), part 2
2015-04-06 15:16:17 +02:00
372a08b32b
Merge remote-tracking branch 'upstream/dev' into NewThermals
2015-04-05 23:03:54 +02:00
b69ab10da0
Merge branch 'dev' into aiemergencymessage
2015-04-05 17:39:30 +01:00
2063ebb8d8
Reflex runtime fix
...
- Fixed runtime when reflex shooting targets
- Fixed runtime when stopping aiming at a target which has lost its connected client
2015-04-05 23:42:01 +12:00
75757a48f6
Merge remote-tracking branch 'upstream/dev' into Map
2015-04-05 09:55:41 +02:00
d3a1ddfa09
Thermal/NVG changes.
...
Thermals/NVGs can now be toggled on/off from the GUI action bar, same as mesons.
Adds charge sound for special goggles.
2015-04-05 09:54:55 +02:00
fb235bf82c
Nicer formatting of weapon firing text.
2015-04-05 08:29:59 +01:00
c86706f0d3
Merge pull request #8699 from mwerezak/docking-update
...
Adds docking support for multishuttles
2015-04-05 09:49:59 +03:00
d254725766
Oversights.
2015-04-04 21:49:05 -07:00
fa8ee58183
Fixes a monkey runtime and updates head reattachment surgery.
2015-04-04 20:03:54 -07:00
14124985cc
Offhand gun doesn't decrease probability of accidental shot now.
2015-04-05 05:29:04 +03:00
ae75e3555e
Merge remote-tracking branch 'remotes/upstream/dev-freeze' into conscience
...
Conflicts:
code/modules/mob/living/carbon/human/human_attackhand.dm
2015-04-05 05:23:14 +03:00
326fde4c5f
Adds the research module, condensed into one commit so far.
2015-04-04 20:17:59 -04:00
cf74e22870
Hardsuit Stuff
...
Icons for all modules and control modules, two new suits, some modified
stats. Station suits are now split, with their spawned "equipped"
version having modules and access requirements, and their parent type
having neither.
2015-04-04 17:59:10 -04:00
ef105f0659
Additional checks for paper work
2015-04-04 23:47:22 +03:00
f74fc1a2bd
Fix checking in paranoid mode for debug verbs
2015-04-04 16:30:28 +03:00
db30c15e4c
Updates to science
...
Protolathe and CI build procs moved to them from RD console.
Protolathe and CI now have a build queue. Designs take varying time to
build.
P and CI material storage is now a list instead of a set of vars.
origin_tech is now a list.
All sheets now contain exactly 2000 units of matter.
In design datum, chemicals and materials are two separate lists.
Designs are now sorted. The method is kinda hacky but flexible. They
have a var, sort_string. Designs are sorted alphabetically using it.
Circuits how show whether they build a machine or a computer in CI menu.
Adds item construction, for now protolathe is used.
2015-04-04 13:38:03 +03:00
b197cb69fa
More organ fixes. Yay.
2015-04-03 21:47:37 -07:00
3493b60faf
Attempting to fix icon procs for organs.
2015-04-03 21:04:05 -07:00
be270bb0d3
Runtime fixes.
2015-04-03 20:56:37 -07:00
ee657d64f8
Fixes handle_grasp() spam.
2015-04-03 19:15:47 -07:00
05e85fc134
Should fix the limb spam issue.
2015-04-03 19:11:35 -07:00
78925ebd79
Minor loc oversight.
2015-04-03 18:48:49 -07:00
2ae7c93582
God dammit copypaste before commit.
2015-04-03 18:47:59 -07:00
3c767c50fa
Refactors
2015-04-03 21:33:33 -04:00
Neerti