Fox-McCloud
469295e791
Merge pull request #2183 from Markolie/zefixes
...
Changeling language fix, additional logging
2015-09-26 17:40:46 -04:00
Fox-McCloud
821d2d0309
Merge pull request #2167 from Markolie/SDQL
...
Add SDQL, +PROCCALL, admin updates
2015-09-26 17:40:03 -04:00
Markolie
1011d57321
Changeling language fix, additional logging
2015-09-26 22:27:36 +02:00
Markolie
d4e5149389
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fluff
...
Conflicts:
code/modules/mob/living/silicon/robot/drone/drone.dm
2015-09-26 05:12:52 +02:00
Markolie
ce9545525c
Varedit right checks update
2015-09-25 18:33:51 +02:00
Markolie
24337913cd
Add SDQL, +PROCCALL, admin updates
2015-09-25 16:54:27 +02:00
Markolie
e96103a02b
Fluff item clean-up
2015-09-25 04:31:30 +02:00
Tigercat2000
4f3938d68b
-tg- buckling system
...
This commit overhauls a bunch of systems so that buckling works for
any subtype of /obj. This means that space vines and chairs and beds all
use the same system. A lot of stuff has been touched.
2015-09-24 15:52:10 -07:00
Markolie
fa0efbf983
Update admin announce, edit memory fix
2015-09-24 03:18:14 +02:00
Markolie
c4b20ccb5e
Add full logging to the traitor panel
2015-09-24 03:06:03 +02:00
Markolie
9adff714b9
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into sql
...
Conflicts:
code/controllers/configuration.dm
config/example/config.txt
2015-09-23 07:07:17 +02:00
Markolie
9d49985e1c
Offer control to ghosts option
2015-09-23 04:44:12 +02:00
Fox-McCloud
bd3696523b
GC a few Datums
2015-09-20 22:40:13 -04:00
Fox-McCloud
1d91e31d17
pass II, taperecorder exploit fix
2015-09-18 05:46:00 -04:00
Fox-McCloud
74565c101b
Fixes up a few Destroys
2015-09-18 04:20:02 -04:00
Markolie
2e064a1050
Fix Wizard infinite spell exploit
2015-09-18 05:03:17 +02:00
Markolie
90f722d752
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom
...
Conflicts:
code/modules/projectiles/guns/projectile/automatic.dm
icons/mob/back.dmi
2015-09-15 04:18:27 +02:00
Fox-McCloud
6fd7350746
Merge pull request #2040 from Markolie/guns
...
Guns update
2015-09-14 22:11:33 -04:00
Fox-McCloud
18a137e778
Merge pull request #2022 from TheDZD/lightning-progress
...
Lightning Bolt Spell Progress Bar
2015-09-14 00:50:22 -04:00
Markolie
f41f0a59fe
Guns update
2015-09-14 04:05:20 +02:00
Fox-McCloud
8afd2faa7c
Fixes Autolathes and Stacks
2015-09-13 18:59:36 -04:00
Markolie
ca6c7d10ba
In hand sprite overhaul
2015-09-13 22:44:18 +02:00
DZD
61a9a87232
Lightning bolt spell progress bar
2015-09-12 19:43:23 -04:00
Fox-McCloud
54fc3d9aa2
fixes
2015-09-12 15:59:02 -04:00
Fox-McCloud
15fc8144e8
Protolathe Materials Refactor
2015-09-12 03:35:22 -04:00
Fox-McCloud
1c6c733a52
Nuke Ops and Traitor Update+Balance
2015-09-08 19:38:30 -04:00
Fox-McCloud
64b2bb3784
Merge remote-tracking branch 'upstream/master' into material-datums
2015-09-04 22:53:20 -04:00
Markolie
d1cb874451
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom
2015-09-05 01:39:40 +02:00
Fox-McCloud
7c29e59784
Materialized Datums
2015-09-04 01:40:06 -04:00
Markolie
65c793f9ac
Fix Antimov typo
2015-09-03 20:20:17 +02:00
Fox-McCloud
66edd1826e
Adds in E-Daggers
2015-09-01 17:56:01 -04:00
Fox-McCloud
9695509908
Merge pull request #1919 from tigercat2000/funlittletgthings
...
Progress bars
2015-09-01 16:45:10 -04:00
Tigercat2000
7f4ac72910
Progress bars + Wall Rationalization
...
This commit does the following:
- Ports progress bars from -tg- (tgstation/-tg-station#9921 )
- Refactors wall attackby code to make it 100% less insane; Instead of
manually checking every little thing, it uses do_after,
consequentially, making the new progress bars affect dealing with walls
as well.
Wall code makes a tiger sad.
2015-08-31 13:38:51 -07:00
Markolie
b999ca32b8
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lawmanager
...
Conflicts:
_maps/map_files/cyberiad/cyberiad.dmm
2015-08-31 02:23:24 +02:00
Markolie
5dc034719d
Port Bay's silicon law manager
2015-08-31 02:18:49 +02:00
Markolie
2787c2fd46
sortAtom improvements
2015-08-28 23:52:27 +02:00
Fox-McCloud
386ccd9717
Merge pull request #1844 from Markolie/cargonia
...
Cargo interface overhaul
2015-08-25 16:29:56 -04:00
Markolie
6a6f09ed36
Cargo interface overhaul
2015-08-24 19:20:20 +02:00
Markolie
93c52de1f9
Power monitor update
2015-08-23 23:58:38 +02:00
DZD
0965789925
Fix merge conflicts
2015-08-21 18:38:42 -04:00
Fox-McCloud
64af990d63
Merge pull request #1806 from Markolie/nukegoesboom
...
Nuke update
2015-08-21 16:56:30 -04:00
Markolie
f6c8358fa2
Fix reference to nuke
2015-08-20 21:57:41 +02:00
Markolie
175bea62ca
only change alert level on non-syndi nukes
2015-08-20 21:25:07 +02:00
Markolie
4bd4452086
More nuke updates
2015-08-20 19:21:46 +02:00
Markolie
59a86e5711
Make nuclear bomb use wires datum
2015-08-20 18:47:19 +02:00
TheDZD
0c31d41e78
Merge pull request #1792 from Markolie/nano
...
NanoUI pod tracker/exosuit console, uplink fix
2015-08-20 11:50:14 -04:00
DZD
f3970fb304
Wizard touch attacks and fixes
...
- Flesh to Stone and Disintegrate are now actual touch attacks.
- Fixes issue with in-hands and back sprites missing for the staff of
animation.
- Fixes missing right-handed in-hand for the staff of healing.
2015-08-20 10:21:45 -04:00
Markolie
b6a1e52e08
Hopefully fix uplink crashing
2015-08-19 22:22:51 +02:00
Markolie
8bede1db99
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/fox.dm
code/modules/organs/organ_alien.dm
2015-08-18 18:38:59 +02:00
Fox-McCloud
333e7fe236
Merge pull request #1766 from Markolie/adminbus
...
Admin jump overhaul, add watchlist functionality, other admin updates
2015-08-17 18:10:38 -04:00
