c562680098
Merge remote-tracking branch 'origin/master' into bay_examine
...
# Conflicts:
# code/game/objects/structures/displaycase.dm
2015-09-15 14:08:36 -07:00
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
6fd7350746
Merge pull request #2040 from Markolie/guns
...
Guns update
2015-09-14 22:11:33 -04:00
84c60aa560
Monkey/human transform fixes
2015-09-14 22:13:32 +02:00
0603f73232
Bay12 examine overhaul.
...
This commit overhauls the examine system to baystation's latest system,
including a more efficient verb approach, and a new status panel tab,
which shows more information for pre-defined objects.
2015-09-14 11:51:40 -07:00
f41f0a59fe
Guns update
2015-09-14 04:05:20 +02:00
ca6c7d10ba
In hand sprite overhaul
2015-09-13 22:44:18 +02:00
58d40b730d
Changeling Swap Forms Language Fix
2015-09-13 12:33:42 -04:00
04bc49f29e
Merge pull request #2004 from Fox-McCloud/blob-rebalance
...
Blob Rebalance
2015-09-12 01:36:49 +02:00
caf5603822
Properly remove shadowling/cult status from robots
2015-09-11 06:46:07 +02:00
a9a8433fbe
Add hiddenprints to runes
2015-09-11 06:36:23 +02:00
34a32e7166
Fix cult deconversion icons
2015-09-11 06:17:29 +02:00
f31bf75764
Blob Rebalance
2015-09-10 19:12:59 -04:00
8e88ceabd1
fix
2015-09-08 22:25:21 -04:00
380d085f28
ERT exception
2015-09-08 20:12:28 -04:00
b674f247b8
Hijack Objective Rework+Fix
2015-09-08 16:44:51 -04:00
64b2bb3784
Merge remote-tracking branch 'upstream/master' into material-datums
2015-09-04 22:53:20 -04:00
e8f486f397
Merge pull request #1946 from Markolie/intercom
...
Remove radio free range
2015-09-04 22:47:24 -04:00
07acac3bfd
Merge pull request #1944 from Fox-McCloud/cult-tweaks
...
Cult Tweaks
2015-09-04 22:01:11 -04:00
26d0ad3071
Radio access update
2015-09-04 19:29:56 +02:00
a019934e9e
Pass I
2015-09-04 05:18:48 -04:00
3a3457de36
Port Bay's intercom overhaul
2015-09-03 21:21:20 +02:00
9b01dff587
bible rune fix
2015-09-02 22:08:27 -04:00
9b8342897e
Cult Tweaks
2015-09-02 21:08:08 -04:00
50e36fa48c
Merge pull request #1927 from Markolie/cultspeech
...
Add custom styling to cult messages
2015-09-02 15:59:43 -04:00
9695509908
Merge pull request #1919 from tigercat2000/funlittletgthings
...
Progress bars
2015-09-01 16:45:10 -04:00
2d0f77fa1b
Merge pull request #1916 from Markolie/looc
...
Reboot improvements, player panel fix, IsBanned fix
2015-09-01 16:42:09 -04:00
d829e7003a
Merge pull request #1913 from Markolie/lawmanager
...
Port Bay's silicon law manager
2015-09-01 16:41:55 -04:00
be55c0d0d5
Add custom styling to cult messages
2015-09-01 20:02:42 +02:00
9a55dd8a92
Temporarily Disables Hostile Lockdown
2015-09-01 01:59:27 -04:00
57a9fdcc59
Merge pull request #1910 from Markolie/syndistamp
...
Syndistamp
2015-08-31 17:15:01 -04:00
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
ce6ad20cf9
Reboot improvements, player panel fix, IsBanned fix
2015-08-31 17:44:13 +02:00
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
5dc034719d
Port Bay's silicon law manager
2015-08-31 02:18:49 +02:00
1cc4f7f483
Add syndicate stamp
2015-08-30 22:52:31 +02:00
fb8758a83d
Prevent jobbanned people from becoming constructs
2015-08-29 18:56:36 +02:00
0a70d22ad3
Fixes mechas not gc'ing properly
2015-08-28 19:43:24 +02:00
0965789925
Fix merge conflicts
2015-08-21 18:38:42 -04:00
64af990d63
Merge pull request #1806 from Markolie/nukegoesboom
...
Nuke update
2015-08-21 16:56:30 -04:00
175bea62ca
only change alert level on non-syndi nukes
2015-08-20 21:25:07 +02:00
4bd4452086
More nuke updates
2015-08-20 19:21:46 +02:00
59a86e5711
Make nuclear bomb use wires datum
2015-08-20 18:47:19 +02:00
639478ace5
Merge pull request #1777 from Markolie/malf
...
Malf AI update
2015-08-20 11:50:19 -04:00
9e80598119
Merge pull request #1805 from TheDZD/shadowling-fix
...
Shadowling Dethrall Fix
2015-08-20 17:50:04 +02:00
5205f55085
Shadowling dethrall fix
...
Should fix thralls not getting their spells removed upon dethralling.
2015-08-20 11:42:09 -04:00
87570fc080
isNonCrewAntag() checks, key_name fixes
2015-08-20 17:25:55 +02:00
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
286d2301f4
Replace disabling RCD's with exploding them
2015-08-20 01:29:23 +02:00
f635d9c054
Merge pull request #1778 from Markolie/events
...
Revenant update, event weight tweaks
2015-08-19 17:04:14 -04:00
Tigercat2000