Chinsky
aa7fde250c
Merge pull request #7801 from Mloc/bs12-glowypipes
...
refactor buckling + glowy HE pipes
2015-02-03 18:12:09 +03:00
Chinsky
1c3b1087dd
Merge pull request #7582 from Zuhayr/richard
...
Do you like hurting other people?
2015-02-03 18:10:34 +03:00
PsiOmega
1732d0c79a
Merge remote-tracking branch 'upstream/master' into TheGreatPurge
...
Conflicts:
code/WorkInProgress/computer3/computers/message.dm
code/WorkInProgress/kilakk/responseteam.dm
2015-02-03 14:16:14 +01:00
Chinsky
72463a35f3
Another pass at WIP folder
2015-02-03 12:14:13 +03:00
volas
8abd7d0735
correction of all copytext(sanitize(..)) to sanitize(copytext(..))
2015-02-01 22:54:56 +03:00
Chinsky
b995c856a9
Merge pull request #7924 from Kelenius/ofTablesAndPass
...
Removes FPRINT and TABLEPASS flags
2015-01-30 16:17:41 +03:00
Loganbacca
34d44f8732
Tape fixes
...
- Fixed taping paper bundles
- Reduced issues with sticking papers around corners
- Removed a couple of colons from paper_bundle.dm
2015-01-26 15:16:27 +13:00
Kelenius
10de826ca3
Removes FPRINT and TABLEPASS flags
2015-01-23 22:27:32 +03:00
Zuhayr
c61537f265
Adjusting twohanded values as discussed in diff.
2015-01-20 19:15:10 +10:30
Zuhayr
5e7133dd08
Converted baseball bats to twohanded weapons.
2015-01-20 19:14:38 +10:30
Zuhayr
aa5013fa08
Merge pull request #7885 from Baystation12/master
...
Updating dev-freeze from master.
2015-01-20 18:49:03 +10:30
Chinsky
d42482c7cc
Fixes #7259
...
Removes forks used for ribcage opening/closing since it overlapped with internal organ surgery and for some reason even priorities didn't help with that.
2015-01-16 14:18:51 +03:00
Loganbacca
985d410657
Air tank interface fix
...
- Allows tanks to be toggled on and off as internals from their UI.
- If internals are off, all tanks capable of being used for internals
will display "tank is connected to a mask".
- If internals are on, only the tank that is actively supplying air is
listed as "connected" and "open". All others will display as "not
connected".
- Tanks inside rigs will correctly display their status in their UI (if
you open it before putting it in the rig, but cannot be toggled on
through the interface. Toggling them on with the internals button works.
2015-01-13 23:19:58 +13:00
Mloc-Argent
537b78fc80
refactor buckling to be more generic
...
Buckling procs and vars have been moved down to /obj.
Behaviour is mostly the same, but you can buckle cuffed people to
pipes and they will automatically unbuckle if the cuffs are removed.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2015-01-12 21:28:31 +00:00
Tramziller
11ff174636
Old link was replaced by new one
2015-01-08 22:26:31 +01:00
Zuhayr
b36b41a2f5
Fixes #7656
2015-01-09 03:58:43 +10:30
Zuhayr
9fa73784a5
Fixes #7660
2015-01-05 01:05:13 +10:30
Zuhayr
a255fe48ca
Fixes #7619
2015-01-02 19:28:30 +10:30
Zuhayr
a5b937c1e8
Readded null check.
2014-12-31 14:12:10 +10:30
Zuhayr
505d84049c
Properly implements the species insulated var (renames it to siemens_coefficient), includes it in electrocution, rebalances species values accordingly.
2014-12-28 19:16:07 +10:30
Zuhayr
fabee2fdf8
Stopped glass shards from proning mobs with NO_PAIN.
2014-12-28 17:32:55 +10:30
Zuhayr
931682f926
Fixes #7327
2014-12-27 10:01:17 +10:30
Zuhayr
3997129390
Tidies up setup.dm, moves a bunch of vars to global.dm, changes the case of a couple.
2014-12-25 20:26:22 +10:30
Zuhayr
f4ada7b869
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2014-12-25 20:05:01 +10:30
SkyMarshal
fee93bba38
Fix bloody extinguisher bug.
2014-12-24 16:24:16 -07:00
Zuhayr
c49cb0c645
Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze
2014-12-24 22:43:10 +10:30
Zuhayr
c6245681d6
Fixes #5910
2014-12-24 22:23:26 +10:30
mwerezak
d36f465647
Fixes being able to put lit welders in backpacks
2014-12-24 00:55:56 -05:00
Zuhayr
2ed0e433aa
Table/rack refactor. Fixes #7509
2014-12-24 12:14:48 +10:30
Zuhayr
bbfc6db0a3
Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right)
2014-12-23 17:38:05 +10:30
Zuhayr
32d799e53e
Line ending conflict resolution.
2014-12-22 23:27:06 +10:30
Amunak
16c548b03f
Fixes explosives-on-webbing-prevention not working
2014-12-18 05:27:37 +01:00
Amunak
d28cb57f79
Merges upstream/dev to ref, resolves merge conflicts
2014-12-18 03:44:28 +01:00
Amunak
d20ccdb6b4
More name updates and refactoring for research
...
Also fixes compile errors
2014-12-18 03:26:55 +01:00
Amunak
4882074739
Code formatting, EOL at EOF fixes, refactoring
2014-12-18 03:11:49 +01:00
Amunak
edffbc680d
Fixed capitalization of most game items
2014-12-18 03:10:36 +01:00
Amunak
1fcf11cdb5
You can no longer plant explosives on webbing.
2014-12-18 01:17:50 +01:00
Amunak
cc327cb671
Fixes typos in powercells.dm
2014-12-17 20:03:04 +01:00
Amunak
1a972974bc
Moves all circuitboards to their respective files.
...
Computer boards are now in /code/game/objects/items/weapons/circuitboards/computer/.
Buildable machinery boards are in /code/game/objects/items/weapons/circuitboards/machinery/.
Everything else is just in /code/game/objects/items/weapons/circuitboards/.
The circuitboard parent definition is in /code/game/objects/items/weapons/circuitboards/circuitboard.dm.
Did some minor renaming and capitalization fixes on the boards.
2014-12-17 14:31:21 +01:00
Zuhayr
2214837449
Comments out combi-tool, fixes infinite range combitool.
2014-12-16 18:23:21 +10:30
PsiOmega
8aa5ee4d9a
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-15 08:58:28 +01:00
Zuhayr
70abe4af0d
Merge pull request #7447 from mwerezak/manual-runtime
...
Alternative fix for manual runtimes
2014-12-14 13:06:16 +10:30
PsiOmega
efb6adb452
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-14 00:27:16 +01:00
mwerezak
168cabf03a
Fixes manual runtimes without modifying the construction of every object
...
Loads configuration before map creation instead.
This reverts commit 37b14bae39
2014-12-13 09:35:36 -05:00
Zuhayr
d2803ec4d7
Merge resolution.
2014-12-13 23:10:46 +10:30
Zuhayr
7efae862a2
Fixes #7290
2014-12-13 23:04:13 +10:30
PsiOmega
37b14bae39
Fixes manual runtimes, ensures initialize is called even after round start.
2014-12-12 20:07:53 +01:00
PsiOmega
2e34cb79a5
Morphic Clerical Kit
...
Buy the morphic chameleon stamp (or Stmap) now and get a new pen which fakes signatures for free.
Attempts to improve the value of said chameleon stamp as it feels rather expensive for what it do.
2014-12-12 10:07:42 +01:00
PsiOmega
cf78fe903b
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-12 09:04:09 +01:00
PsiOmega
0cc7998197
Fixes #7378 .
...
Now uses the config.wikiurl setting instead.
Assumes wikiurl is in an format which can accept titles, in Bay12's case: http://wiki.baystation12.net/index.php?title=
2014-12-10 22:27:19 +01:00
