Commit Graph
27537 Commits
Author SHA1 Message Date
Birdtalon f7d96d8cfe re-adds take shortcut into adminhelp 2018-03-19 11:27:21 +00:00
Aurorablade 59cbd79cc3 Fine, no typo 2018-03-13 22:31:27 -04:00
Aurorablade 2a3dd305a9 Obscure Admin Related fixes 2018-03-13 22:22:51 -04:00
tigercat2000andGitHub c4d4c3e23a Merge pull request #8733 from PigeonLord/nabber
Added Medical Marijuana Packets for the Psychologist
2018-03-13 04:58:04 -07:00
tigercat2000andGitHub 27314fded9 Merge pull request #8752 from Citinited/pipes-exploit-fix
Restricts RPD use to certain turf types
2018-03-13 04:57:15 -07:00
tigercat2000andGitHub f531ef72d9 Merge pull request #8751 from PigeonLord/detectiverecorder
Added a Tape Recorder and a box of tapes to the Detective's Locker
2018-03-13 04:56:55 -07:00
tigercat2000andGitHub 4a01ed097d Merge pull request #8750 from PigeonLord/food
I changed the taste description of a few food items
2018-03-13 04:56:42 -07:00
Terilia 28806f8fd5 Merge remote-tracking branch 'upstream/master' into terifluff 2018-03-13 05:20:20 +00:00
TeriliaandGitHub ae88de8669 Trying to solve the merge conflicts. 2018-03-13 04:50:25 +00:00
Fox McCloudandGitHub 96fc4aba1c Merge pull request #8671 from Aurorablade/PodFluff
Fluff Item: Decemviri
2018-03-12 15:58:39 -04:00
Citinited 6441dde560 Removes some obsolete code 2018-03-12 19:20:15 +00:00
Citinited 4bba349cb6 Adds RPD_ALLOWED_HERE flag to deny use of the RPD to certain turf types 2018-03-11 03:44:42 +00:00
Piccione 81f12bf186 Added a Tape Recorder and a box of tapes to the Detective's Locker 2018-03-10 22:13:06 +01:00
Piccione 06fa27ac28 I changed the taste description of a few food items 2018-03-10 21:48:55 +01:00
Piccione 8799c0cf42 Put the correct drug id in the cigarette for THC 2018-03-08 23:24:33 +01:00
Piccione 35f1956db7 Switched the Space Drugs in the Weed Cigarettes with more healthy THC 2018-03-08 23:18:54 +01:00
tigercat2000andGitHub fce0f75eb1 Merge pull request #8741 from shazbot194/Desolate_Fluff
Desolate's fluff name fix, no longer dancing fluff item
2018-03-07 22:47:49 -08:00
shazbot194 413118d1b4 Removes the dance machine 2018-03-07 15:30:40 -09:00
Tad Hardesty 1ca410b91e Fix various syntactic problems 2018-03-06 23:19:39 -08:00
shazbot194 79539cc0ea Name and Description change
I forgot to ask Desolate what he wants, here is the fix for that
2018-03-06 22:18:17 -09:00
shazbot194 cc5d9bc31e Adds in Desolate's dance machine button 2018-03-06 22:10:12 -09:00
Piccione 3bcc12bd94 Added Weed Packets 2018-03-06 22:22:10 +01:00
tigercat2000 add4852d3c Remove purple rose properly 2018-03-06 04:46:17 -08:00
RegenandGitHub ff68c12b31 Removes purple hair flower pin
Removes the purple hair flower pin, as this is my fluff item.

@Tigercat2000 is moving the sprite to the correct folder then he's available.

:CL: Regen
rscdel: Removes the purple hair flower pin from loadout and general player access, because this is a fluff item.
/:CL:
2018-03-06 01:36:10 +01:00
Funce 27d3ccbe10 Allow silicons to properly use interface lock UI. 2018-03-05 11:48:40 +13:00
Fox McCloudandGitHub e1003f0d83 Merge pull request #8489 from KasparoVy/eyeglow
Eyes of Humanoids w/ Great Darkview, XRAY Vision, Synthetic Eyes or Eye Implants Shine in the Dark
2018-03-03 17:20:52 -05:00
tigercat2000andGitHub 693e188362 Merge pull request #8583 from FalseIncarnate/coffee
Coffee Mugs and Vendor Change
2018-03-03 10:32:54 -08:00
FalseIncarnate 3b37c1c48c datum path rename 2018-03-03 13:19:58 -05:00
tigercat2000andGitHub 2887c4a62f Merge pull request #8710 from Birdtalon/pschye-toys
A few more things for the Psyche locker.
2018-03-03 09:59:40 -08:00
tigercat2000andGitHub 65f0895b64 Merge pull request #8693 from Aurorablade/NecaWTF
Why Neca
2018-03-03 09:59:22 -08:00
tigercat2000andGitHub d92616c948 Merge pull request #8660 from Tayyyyyyy/ai_status
Port tg AI status panel
2018-03-03 09:59:06 -08:00
tigercat2000andGitHub aca2769324 Merge pull request #8681 from DarkPyrolord/BluespaceSlices
Fixes bluespace bread (and other slice foods as well)
2018-03-03 09:30:23 -08:00
tigercat2000andGitHub 087457fa9b Merge pull request #8675 from Serkket/001
Bug-B-Gone
2018-03-03 09:28:12 -08:00
tigercat2000andGitHub 014e7725ee Merge pull request #8715 from shugnk/shugnk-manuals.dm-patch
Fix DAT and Iframes for Books
2018-03-03 09:03:18 -08:00
Citinited 8d559ab9b3 fixes posibrains going to nullspace after losing at russian roulette 2018-03-02 21:44:58 +00:00
Citinited c6cc30ff8c Fixes a runtime that can be caused by headless IPCs 2018-03-02 21:39:48 +00:00
FalseIncarnate 060117f5c3 novelty datums 2018-02-28 22:13:38 -05:00
Birdtalon 3787190fb4 changes for loop 2018-02-27 14:29:37 +00:00
tigercat2000andGitHub 371f5d8f59 Merge pull request #8711 from Birdtalon/sec-photos
Removes printing photos from security consoles
2018-02-26 10:32:12 -08:00
Birdtalon e2039350c7 Comments out photo printing parts of security console and associated proc 2018-02-26 18:19:49 +00:00
shugnkandGitHub bbd681e369 Manuals.dm fix
Fixed Dat descriptions and Iframes. Also fixed nanotrasen letter case
2018-02-25 20:02:48 -05:00
shugnkandGitHub a0d65887b3 Delete manuals.dm 2018-02-25 20:01:20 -05:00
shugnkandGitHub cd90c3a328 fix again 2018-02-25 19:55:08 -05:00
shugnkandGitHub 7325527024 Fix DAT and Iframes for Books
With NanoTrasen changed to Nanotrasen as well
2018-02-25 19:52:48 -05:00
tigercat2000andGitHub b8b5795636 Merge pull request #8704 from Aurorablade/SkrellHair
New hair for Skrell and one for Taja
2018-02-24 19:19:23 -08:00
Birdtalon 24b867cd76 removes printing photos from security consoles 2018-02-24 16:38:10 +00:00
Birdtalon dd3c11a757 for loop 2018-02-23 22:28:29 +00:00
Birdtalon 904131be1e some more toys for psyche 2018-02-23 13:48:08 +00:00
Aurorablade 86f25c5e7f fixes some words... 2018-02-21 23:31:43 -05:00
Fox McCloudandGitHub 010d8d5eca Merge pull request #8651 from uraniummeltdown/titaniummineral
Titanium
2018-02-21 03:20:20 -05:00