Crazylemon64
4a914c2a23
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2017-01-06 05:15:11 -08:00
Fox McCloud
29ca57b4af
Merge pull request #6064 from Krausus/SDQL2-client-fix
...
Fixes SDQL2's client manipulation
2017-01-06 08:09:25 -05:00
Crazylemon64
ec0f13d41e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2017-01-06 05:01:43 -08:00
Crazy Lemon
7e0183f23f
Merge pull request #5224 from Kyep/jobs_unlock_system
...
Playtime Tracking
2017-01-03 18:06:28 -08:00
Krausus
6bacdf5b0f
Fixes SDQL2's client manipulation
2017-01-02 22:19:52 -05:00
Aurorablade
98b7a89a17
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
...
# Conflicts:
# code/game/machinery/doors/airlock.dm
2016-12-29 11:01:43 -05:00
Crazylemon64
6d3e66f41c
Polishes up the reset_view proc, which is basically
...
`reset_perspective` from tgstation.
Also adds various support for remote viewing lenses - like cameras not
transmitting xray vision, among other things
Recommit because we're using different compiler versions
2016-12-21 17:56:57 -08:00
Aurorablade
d9758cf31e
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub
2016-12-09 16:50:29 -05:00
Fox McCloud
d95a679273
Merge pull request #5938 from Kyep/sit_v3
...
SIT/ERT Runtime fix, misc fixes
2016-12-08 21:48:50 -05:00
Fox McCloud
287226fa19
Merge pull request #5858 from Markolie/grammarnazi
...
Verb category changes, telecoms verb fix
2016-12-07 12:33:36 -05:00
Aurorablade
81e740e6e5
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub
2016-12-06 21:51:53 -05:00
Kyep
945225b6e8
Runtime & bug fixes
...
- Fixes a runtime in preferences.dm created by the Patreon PRs,
triggered when an ERT, SIT, or any other clientless mob uses
"var/datum/preferences/A = new()".
- Fixes a bug where, if a SIT is spawned with the 'choose manually'
option, one fewer person than intended is pulled in.
- Fixes syndicate headset not being included in the SIT member's notes.
- Deletes commented code.
2016-12-03 06:24:47 -08:00
Crazy Lemon
51822ab940
Revert "Revert "Makes the admin logout tracking system actually work""
2016-12-03 02:23:18 -08:00
Crazy Lemon
c8f54b4d53
Revert "Makes the admin logout tracking system actually work"
2016-12-03 01:53:47 -08:00
Aurorablade
fa1aa894ea
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-12-01 18:04:07 -05:00
Kyep
65761b7ac1
Adds UID support
2016-11-28 22:39:04 -08:00
Kyep
7b20d7561e
Merge remote-tracking branch 'ParadiseSS13/master' into jobs_unlock_system
2016-11-28 22:19:27 -08:00
Kyep
3865213358
Crazylemon changes
...
- Adds UID
- Removes cats
- Adds .Join
2016-11-28 22:19:07 -08:00
Crazylemon64
8271a89dab
Makes the admin logout tracking system actually work
2016-11-27 12:00:57 -08:00
Fox McCloud
55fc510c92
Merge pull request #5859 from Markolie/oocthrottle
...
[s]Adds OOC throttling
2016-11-24 07:46:35 -05:00
Aurorablade
0c637cebfa
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub
2016-11-22 01:48:56 -05:00
Crazy Lemon
f215041315
Merge pull request #5893 from Fox-McCloud/event-cleanup
...
Removes Event Procs
2016-11-21 16:51:16 -08:00
Fox-McCloud
9ace0245cf
Removes Event Procs
2016-11-16 07:14:08 -05:00
Aurorablade
5d392b36a4
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-11-15 15:30:36 -05:00
Fox-McCloud
fcc20ac6bc
BSA Tweaks
2016-11-09 22:36:03 -05:00
Markolie
75176722e7
Add OOC throttling
2016-11-08 17:01:44 +01:00
Markolie
42dd03b2cf
Fix up buildmode log
2016-11-08 16:31:48 +01:00
Markolie
cff0528673
Verb category changes, telecoms verb fix
2016-11-08 16:23:13 +01:00
Aurorablade
23e392f0ef
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-10-31 22:38:14 -04:00
Fox McCloud
911fa70e1a
Merge pull request #5601 from Crazylemon64/status_effect_overhaul
...
Ports over the status effect unification from the extreme refactor
2016-10-30 22:40:24 -04:00
Aurorablade
1a6803c7bb
Comments done mostly...Slughter demon whispers runtimes.
2016-10-27 20:44:54 -04:00
Markolie
e9dc5b1b1f
Fix secure briefcases appearing empty
2016-10-27 14:56:58 +02:00
Aurorablade
0a265f963c
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-10-24 22:30:16 -04:00
Crazylemon64
6a7f7394a8
Ports over the status effect unification
2016-10-23 15:45:35 -07:00
Markolie
1a307cd8c9
Identity theft objective set fix, tank examine fix, proccall null return fix
2016-10-21 17:51:38 +02:00
Aurorablade
e2ce799aa1
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-10-08 22:21:48 -04:00
Kyep
7e613798b0
Fixes merge conflict in admin_verbs.dm
2016-10-01 13:26:24 -07:00
Krausus
f010e142ce
Fixes selecting datums through SDQL2
2016-09-26 04:54:34 -04:00
Fox McCloud
86afa72148
Merge pull request #5647 from Krausus/mentorchat
...
Changes Mod Say Into an Admin-to-Mentor Message Verb
2016-09-14 20:44:46 -04:00
Krausus
ce41e99f35
Fixes PMing stealthmins
2016-09-13 00:43:19 -04:00
Krausus
8625131204
Adds "Toggle Mentor Chat" verb
2016-09-12 23:27:07 -04:00
Krausus
5c5efe5087
Conflict resolution
2016-09-12 21:57:44 -04:00
Fox McCloud
c56961f6f0
Merge pull request #5642 from Krausus/UniqueIDs
...
Adds Unique Identifiers with Topic and VV Integration
2016-09-12 15:32:20 -04:00
Fox McCloud
336d37a36f
Merge pull request #5624 from Kyep/syndie_radio
...
Creates Syndicate Team Radio Frequency
2016-09-12 14:36:31 -04:00
Krausus
a9db8329d3
Revert "Adds cmd_mentor_say to mentor verbs"
...
This reverts commit dda0a27bb0
2016-09-12 10:03:45 -04:00
Aurorablade
f1aada7ea1
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-09-11 19:50:53 -04:00
Krausus
7ccedd41b4
Fixes automated ban notes having bad ckeys
2016-09-10 19:44:05 -04:00
Krausus
dda0a27bb0
Adds cmd_mentor_say to mentor verbs
2016-09-09 17:03:31 -04:00
Krausus
b0ac462166
Integrates UIDs into View Variables
2016-09-08 19:04:50 -04:00
Krausus
d64bf46f12
Topic UID finishing touches
2016-09-08 13:07:14 -04:00
