LBraindead
ca2de46bc8
Update turf.dm
...
preventing space being made and immediately changed to open space
2014-01-18 00:28:20 +01:00
LBraindead
9d618b2a11
Update lattice.dm
...
allow lattices to exist on open space
2014-01-18 00:16:14 +01:00
Ccomp5950
8a179a8ff1
Merge pull request #4299 from Faerdan/dev
...
Canister, Tank & Tank Transfer Value NanoUIs.
2014-01-15 15:21:47 -08:00
Ccomp5950
dd7fef9dc2
Merge pull request #4277 from RKF45/paint
...
BS12 posters
2014-01-15 14:02:47 -08:00
RKF45
30f2d49f01
Quotes inside strings confuse and scare me.
2014-01-15 22:45:10 +01:00
Mark Aherne (Faerdan)
024a0baa49
Canister, Tank & Tank Transfer Value NanoUIs.
...
* Added Canister, Tank & Tank Transfer Value NanoUIs.
2014-01-15 01:08:45 +00:00
RKF45
5083e1cd47
Requested adjustments
2014-01-13 22:54:47 +01:00
RKF45
0a4a7c7c08
Merge remote-tracking branch 'upstream/dev' into paintmixing
2014-01-13 22:15:33 +01:00
Mloc
c46d872e6c
Merge remote-tracking branch 'upstream/master' into dev
2014-01-12 19:46:31 +00:00
RKF45
b9c747aeaf
Makes mixing paints actually make sense
2014-01-12 12:04:18 +01:00
Chinsky
1d6c645bc9
Merge pull request #4279 from Ccomp5950/pda_optimizations
...
NanoUI PDA optimizations no more sortAtom every tick on every PDA.
2014-01-11 18:48:55 -08:00
Ccomp5950
83ef93c41c
Merge pull request #4270 from Baystation12/master
...
Merge master into Dev
2014-01-11 18:18:03 -08:00
Rob Nelson
56e4b11ec5
Dynamic loading of posters
...
* Add dynamic loading of poster designs (untick group in DM to remove, no more toggles)
* Fixes wirecutters duping posters
* Fixes dropped posters not being placeable.
2014-01-11 18:10:31 -08:00
Ccomp5950
167671d583
NanoUI PDA optimizations no more sortAtom every tick on every PDA.
...
Should be noticably better on large population servers.
2014-01-11 20:09:11 -06:00
Rob Nelson
2e903710b0
Merge branch 'paint' of https://github.com/RKF45/Baystation12 into paint
2014-01-11 17:58:28 -08:00
RKF45
9e0391af04
Adds Baystation 12-specific posters
2014-01-12 01:42:41 +01:00
RKF45
fabfceaa5a
Fixed forever!
2014-01-11 22:50:22 +01:00
RKF45
8758ece582
Alright already.
2014-01-11 22:42:42 +01:00
RKF45
140fb27889
Fixes
2014-01-11 22:36:35 +01:00
RKF45
8b384b0668
Various
2014-01-11 22:22:24 +01:00
RKF45
ab8763378b
Paint mixing
2014-01-11 22:19:02 +01:00
Loganbacca
909928f3f9
Plasma glass stacking fix
2014-01-11 18:14:51 +13:00
Ccomp5950
3d34567d56
Merge pull request #4269 from LightningIron/master
...
Bugfixes
2014-01-10 19:28:23 -08:00
Zuhayr
adaccb3c3e
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-11 10:45:57 +10:30
DJSnapshot
4219b597b6
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/modules/customitems/item_defines.dm
2014-01-10 13:52:07 -08:00
Mloc
6f01e97161
Merge pull request #4248 from Zuhayr/dev
...
Dionaea changes (microwave recipe, holder procs) and resist verb.
2014-01-10 13:47:46 -08:00
Mloc
efa5a600e3
Merge pull request #4252 from RKF45/ears
...
Tiny objects on ears
2014-01-10 13:47:10 -08:00
DJSnapshot
e524d2112f
Merge pull request #4244 from LightningIron/master
...
Ninja bugfixes/minor code cleaning/energy cost changes
2014-01-10 13:42:42 -08:00
DJSnapshot
f911f84bbd
Replaces modwho and adminwho with staffwho.
...
(Also, stealthfix.)
2014-01-10 12:49:32 -08:00
Mloc-Argent
4c1e17649e
Merge remote-tracking branch 'upstream/master' into dev
2014-01-10 20:07:47 +00:00
Chinsky
76dc0c4c49
Merge pull request #4234 from Mloc/bs12-quicklist
...
[TG] Optimized and refactored list2text, text2list, and replacetext.
2014-01-10 11:55:33 -08:00
Zuhayr
38f47f5ae1
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-10 21:27:15 +10:30
Zuhayr
65e6a79946
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2014-01-10 21:26:47 +10:30
DJSnapshot
1e4abf785e
Merge pull request #4237 from Mloc/bs12-tgstuff
...
[TG] Lots of small (and maybe not so small) changes from tg.
2014-01-09 22:33:28 -08:00
RKF45
16cc421e34
Tiny objects on ears
2014-01-09 23:45:08 +01:00
DJSnapshot
418a4b3631
Merge pull request #4247 from Zuhayr/master
...
Cryostorage fixes.
2014-01-09 14:39:08 -08:00
RKF45
c47be94b42
Removes braindeath as IC term
2014-01-09 21:49:21 +01:00
Mloc-Argent
dfe18845be
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-01-09 17:42:30 +00:00
LightningIron
2c1f721749
Fixes #4221 .
2014-01-09 11:37:48 -06:00
LightningIron
8c26c23157
Merge remote-tracking branch 'upstream/master'
2014-01-09 11:15:26 -06:00
Zuhayr
f311177654
Changed world loop to all_objective loop in cryopod check. Added all_objective add/remove procs to datum/objective.
2014-01-10 01:24:24 +10:30
Zuhayr
bef27e5bac
Dionaea (or anything using a holder) can now be microwaved. Mmm-mm.
2014-01-10 00:07:26 +10:30
Zuhayr
943554242a
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2014-01-09 23:53:34 +10:30
Zuhayr
a81fd94db1
Objectives will now updated when the target enters cryostorage.
2014-01-09 22:59:16 +10:30
Zuhayr
54015ccdf4
Fixes some items remaining after the pod procs.
2014-01-09 22:06:26 +10:30
Zuhayr
70fe0e02cd
Merge pull request #4245 from SkyMarshal/airfixes
...
Lots of bugfixes.
2014-01-09 02:47:20 -08:00
SkyMarshal
8ecfd56540
Some turf cleanup and the like. Trace gases are now properly handled by ZAS on world load.
...
Fixes #2485
2014-01-08 21:36:03 -07:00
SkyMarshal
2308e71157
Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed.
2014-01-08 21:33:17 -07:00
LightningIron
24be1d4a23
Fixed accidental change of ninja cell to super capacity.
2014-01-08 21:10:17 -06:00
LightningIron
7a37eac624
Miscellaneous ninja fixes and ability cost changes (because nearly all were inconsistent with listed/actual cost), e-net fix
2014-01-08 20:52:51 -06:00
