eb4f2af194
Revert "Tail Wagging System"
...
This reverts commit 70a231f2dc
2015-02-20 03:32:00 -05:00
1c32a43506
Revert "Death Wagging"
...
This reverts commit bbb4900197
2015-02-20 03:30:36 -05:00
be2e754706
Syndicate Rebalance
2015-02-20 03:14:12 -05:00
826ccaed70
Extra Freeze features- Prevent direct touching and pulling
2015-02-20 05:16:03 +01:00
4345506c9c
Merge branch 'master' of github.com:ParadiseSS13/Paradise into FreezeMob
...
Conflicts:
code/modules/admin/admin_verbs.dm
2015-02-20 03:52:58 +01:00
bbb4900197
Death Wagging
2015-02-19 21:49:45 -05:00
2e848c2c37
Merge remote-tracking branch 'upstream/master' into changeling
2015-02-19 20:59:41 -05:00
212ca5f5bd
MERGE CONFLIIIIIICTS
2015-02-19 20:26:36 -05:00
d54579850c
Revert "Saycode/language/species port from Bay"
2015-02-19 20:15:42 -05:00
5cad457f94
Span class fix
2015-02-19 20:01:23 -05:00
70a231f2dc
Tail Wagging System
2015-02-19 19:41:40 -05:00
d0d6c8eebd
Merge with upstream/master
...
Fixes merge conflicts.
2015-02-19 19:38:48 -05:00
c11bb0d283
Fixes bugs
...
- Tables can't have NODROP or ABSTRACT items placed on them anymore,
same for lockers and crates.
- Fixes a runtime with trying to strip a NODROP or ABSTRACT item.
2015-02-19 19:32:58 -05:00
043a5e0e31
Merge pull request #331 from Markolie/master
...
Saycode/language/species port from Bay
2015-02-19 19:07:25 -05:00
46c53be6f1
Part 2 of saycode/language/species port from Bay. Also includes bugfixes.
2015-02-20 00:50:28 +01:00
2c6da21cf8
Fix
2015-02-19 17:54:19 -05:00
4be5819122
Merge pull request #339 from Fox-McCloud/Explosives
...
Chem Boom Nerf
2015-02-19 17:39:27 -05:00
abd2a3d48f
Additional drone icons
2015-02-19 17:29:15 -05:00
6ef9346af7
Flash Powder Fixup
2015-02-18 23:51:54 -05:00
beae1bbe0f
Mai Immershun
...
The hills are filled with the sounds of mining
2015-02-18 23:14:28 -05:00
7e635a967e
Fix compile
2015-02-19 01:40:28 +01:00
dad0b2d856
Fix AI tracking, karma message fix, karma say fix, robot storage sprite change
2015-02-19 01:05:00 +01:00
1812a36113
Chem Boom Nerf
2015-02-18 17:13:58 -05:00
69a7d19380
Compile fix & Latejoin heads get added to target lists
2015-02-18 16:27:46 -05:00
a780eccdaf
Check Antagonist Rev Extra Head Bug
2015-02-18 16:02:25 -05:00
4bcdb94a99
Merge with upstream/master
...
Fixes conflicts
2015-02-18 13:41:32 -05:00
75e0841dff
Fixed detective laptop security access
2015-02-18 19:37:23 +01:00
fbd9c367c0
NODROP flag addition & handling
...
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
2015-02-18 13:22:41 -05:00
87ed05c146
Merge pull request #326 from Artorp/AutolatheQueue
...
Added queue functionality to the autolathe
2015-02-18 16:16:05 +01:00
b407810e07
Merge pull request #324 from ZomgPonies/rev
...
New +MENTOR permission for mentors
2015-02-18 16:15:44 +01:00
6558590cb3
Fixed MAX SCIENCE moved admin verbs around
2015-02-18 09:21:31 -05:00
97f80d0f5b
Merge pull request #323 from Fox-McCloud/Sounds
...
Sounds
2015-02-17 18:44:54 -05:00
2adf44e4a1
Borer, pAI and posibrain language fix
2015-02-17 23:36:46 +01:00
12b297219d
Fix AI eye icon
2015-02-17 23:33:32 +01:00
21926c9e48
Part 1 of saycode/language/species port from Bay
2015-02-17 23:20:50 +01:00
d3a827f9e8
Move Fax Panel to Event tab since it's IC info
2015-02-17 15:13:07 -05:00
91b0a3553f
Check new players to mentors and view variables to mods and up
2015-02-17 15:12:55 -05:00
8a0d5f05d8
Merge pull request #322 from Markolie/master
...
Refactor announcement system, crew monitor overhaul, z-level checks, add portable crew monitor, fixes
2015-02-17 14:05:49 -05:00
e1eb2b9a1d
Updated m_amt and g_amt to match their design
2015-02-17 18:52:31 +01:00
4be671c80e
In accordance with MarkvA's recommendation, switches 'world' to
...
'mechas_list'.
2015-02-17 18:17:10 +01:00
d23d8af778
Port of freeze mob verb from NSS Pheonix
2015-02-17 18:04:31 +01:00
e2060f405e
Downgrade list of potential ahelp subjects to 2: Complaint or Question
2015-02-17 09:21:22 -05:00
efe13b39bd
Remove msay from mentors
2015-02-17 09:12:43 -05:00
03a08e931a
Fixes problem with sound toggles.
2015-02-17 04:55:18 -05:00
c218a2457f
New +MENTOR permission for mentors
2015-02-17 02:28:00 -05:00
f5e2d82953
(Plasma decal already fixed) - Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/game/machinery/atmoalter/canister.dm
2015-02-17 02:12:22 +01:00
f590c215b7
Comma fix
2015-02-17 01:04:38 +01:00
d7f17f6eba
Bug fixes, give roboticist toolbelt, AI recall shuttle option
2015-02-17 01:04:04 +01:00
a84ec1d741
Move mass hallucination event to moderate, change weight of cargo bonus
2015-02-16 23:05:25 +01:00
4d8481f83a
Merge surgical borgs and crisis borgs
2015-02-16 22:47:55 +01:00
Fox-McCloud