Mark van Alphen
0f98a95666
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# icons/mob/actions/actions.dmi
# paradise.dme
2019-05-13 22:14:38 +02:00
AffectedArc07
ec790efeaa
SSticker
2019-04-30 16:47:47 +01:00
Mark van Alphen
7fef96e38d
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# paradise.dme
2019-04-21 23:27:23 +02:00
Mark van Alphen
6faf9c769f
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/modules/mob/living/simple_animal/friendly/farm_animals.dm
# paradise.dme
2019-04-17 22:46:43 +02:00
AffectedArc07
52dff88bd9
Die monster! You don't belong in this world!
2019-04-17 16:30:43 +01:00
Arkatos1
5edc1378f8
New tips, renamed show tip verb, new Random Tip verb
2019-04-05 14:43:38 +02:00
Arkatos1
51c91337c2
Adds show tip admin verb and Tip of the round
2019-04-04 15:37:07 +02:00
Mark van Alphen
1619bc048b
Lavaland baseturf implementation
2019-03-31 22:07:30 +02:00
variableundefined
f27ccc0808
Merge pull request #10238 from Kyep/cryotool_update
...
Admin SSD tool update
2018-11-16 11:03:13 +08:00
tigercat2000
9e51b56cbd
NTSL2 fixes ( ParadiseSS13/Paradise#10232 )
2018-11-15 11:03:16 -08:00
variableundefined
d34841ca63
Merge pull request #9138 from tigercat2000/NTSL2
...
NTSL2
2018-11-15 17:58:27 +08:00
Kyep
3c9b63e875
mark obj targets, despawn_occupant
2018-11-13 20:44:21 -08:00
Ty-Omaha
eef502bebf
spacing
2018-11-06 11:07:25 -05:00
tigercat2000
0a289875ce
Merge remote-tracking branch 'upstream/master' into NTSL2
...
# Conflicts:
# code/game/machinery/telecomms/traffic_control.dm
# code/modules/admin/verbs/randomverbs.dm
# code/modules/scripting/Implementations/Telecomms.dm
2018-11-05 15:16:07 -08:00
Crazy Lemon
517d7521b4
Merge pull request #9842 from variableundefined/ListFreeSlotNoLie
...
Improve list free slots admin command
2018-10-20 16:37:14 -07:00
variableundefined
8648734e7e
Formatting
2018-10-15 08:11:30 +08:00
variableundefined
7f5fc850fd
Close some span tags
2018-10-14 19:29:29 +08:00
variableundefined
5d9a53a57e
Improve list free slots admin command
2018-10-14 12:34:28 +08:00
Mars
984339ce42
Merge-conflict fix + check for null rather than type.
2018-10-12 18:59:54 +02:00
Mars
d9b60a7bfb
Fix merge conflict
2018-10-09 09:41:37 +02:00
Desolate
4c062212ab
refactors global lists.
2018-10-06 08:02:45 -05:00
Desolate
c974e29a3c
global lists global defined
2018-10-02 15:52:46 -05:00
Crazy Lemon
ca26739109
Merge pull request #9477 from variableundefined/SSPortShuttle
...
Port Shuttle to StonedMC
2018-10-01 01:13:42 -07:00
variableundefined
35342aa4cb
Actually follow up with assignrank
2018-09-28 18:37:07 +08:00
variableundefined
bc22544919
Port Shuttle to StonedMC
2018-09-02 22:22:33 +08:00
Mars
4fa906951a
Use of the flexible macro
...
Mostly regex to catch every \ref with the same formatting, with their
reference and display name.
2018-08-16 20:04:53 +02:00
Aurorablade
e8bb3451db
Stop making Late night PRs fethas
2018-08-02 02:22:02 -04:00
tigercat2000
c028ea2c7b
Minor tweaks & Remove NTSLv1
2018-06-21 21:20:28 -07:00
tigercat2000
24506bd28e
Add NTSL2
2018-06-21 20:49:32 -07:00
Fox McCloud
042ee7b77b
comments
2018-05-14 20:40:39 -04:00
Fox McCloud
f521f2765c
Removes All Modes
2018-05-11 17:55:45 -04:00
IK3I
86944c35ee
More Buttons
...
Deeper down the alert rabbit hole we go.
2018-01-14 15:46:21 -06:00
IK3I
69eab5b919
Requested Changes
2018-01-11 13:08:47 -06:00
IK3I
d57622b460
NARSIE SAYS LEAVE!
...
* Shuttles now properly respect the intentions of eldritch horrors
* Comms consoles will tell you when the shuttle can't be recalled
instead of just saying nope
* Admemes can now designate if their shuttles are recallable when they
call them
2018-01-11 11:41:04 -06:00
IK3I
51c0d509d9
Fixes #8484
...
Switches die after the first else encountered. Surprised it didn't spit
an error for that.
2018-01-11 07:36:20 -06:00
tigercat2000
48d78b4648
Merge pull request #7832 from Fox-McCloud/lungsss
...
Breathing is Now Handled on Lungs
2017-12-01 17:51:19 -08:00
Fox-McCloud
6ec234430e
Merge remote-tracking branch 'upstream/master' into lungsss
...
# Conflicts:
# code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
# code/modules/mob/living/carbon/carbon_defines.dm
2017-11-18 18:49:47 -05:00
Kyep
d37d8d56d9
Stops announcing classified stuff
2017-10-28 05:15:44 -07:00
Fox McCloud
f1f245e3ae
Merge pull request #8153 from imsxz/subtle-message-fix
...
Fixes immersion-breaking typo
2017-09-29 18:46:23 -04:00
imsxz
cad084b8cb
Fixes immersion-breaking typo
2017-09-27 14:54:56 -04:00
Fox-McCloud
003277a89d
Merge remote-tracking branch 'upstream/master' into lungsss
2017-09-17 01:02:33 -04:00
tigercat2000
ec159814e2
Add vv_can_delete, kill last vestiges of 'forbidden objects'
2017-09-15 17:27:33 -07:00
Fox McCloud
13c112358a
Merge pull request #7534 from Kyep/ssd_button
...
Admin 'List SSDs' verb & cryo option
2017-08-16 19:58:52 -04:00
Fox-McCloud
e9e1f2de8e
remove that button!
2017-07-19 12:20:36 -04:00
Fox-McCloud
17d7232cf3
Removes Disease one and Virology
2017-07-08 23:10:17 -04:00
Kyep
dd31646cf2
Formatting
2017-06-17 19:25:19 -07:00
Kyep
46bc0a93bc
Neca Requests
...
Head jobs are now highlighted.
Antags are now highlighted.
Fixes some table formatting.
Removes a src.
No longer permits cryoing mobs already in cryo.
2017-06-12 23:21:26 -07:00
Kyep
5c2aa2208e
Changed to list players, and have individual cryo buttons
2017-06-12 00:20:18 -07:00
Kyep
1b995319fa
Admin 'Cryo SSDs' Verb
...
Adds a 'Cryo SSDs' verb for admins.
This takes all humans on the station who have been SSD for 10 minutes or
more, and are not immune, and puts them in the cryopods. The idea is
that it allows admins an easily way to clean up large numbers of SSD
crew on the station. SSD crew who are off-station, dead, or
pulled/restrained in some way are immune to this.
As a side benefit, this PR also refactors cryopod.dm, removing "loc ="
calls, and turning the process of entering a cryopod into a proc.
2017-06-11 21:29:59 -07:00
Crazy Lemon
be6ab5dc67
Merge pull request #6857 from FlattestGuitar/announcements-fix
...
More announcement tweaks 🔈
2017-04-26 18:54:45 -07:00
