Commit Graph

11622 Commits

Author SHA1 Message Date
deathride58
3e78921e02 Merge pull request #4763 from Citadel-Station-13/upstream-merge-34101
[MIRROR] Removes omnizine (traitor) cigarettes from captain's office on Meta
2018-01-11 21:32:59 +00:00
LetterJay
7c2662f1de custom item 2018-01-11 15:25:47 -06:00
CitadelStationBot
c91f3c18a8 Automatic changelog generation for PR #4762 [ci skip] 2018-01-11 15:19:13 -06:00
LetterJay
c98be44b33 Merge pull request #4762 from Citadel-Station-13/upstream-merge-33817
[MIRROR] [READY]Pulling claw 2
2018-01-11 15:19:11 -06:00
LetterJay
d04260eab2 Merge pull request #4761 from Citadel-Station-13/upstream-merge-34206
[MIRROR] Fixes twohanded weapons not unwielding when you lose an arm.
2018-01-11 15:18:55 -06:00
LetterJay
ef1ac1f0f3 Merge pull request #4760 from Citadel-Station-13/upstream-merge-34204
[MIRROR] improves chem macro feedback
2018-01-11 15:18:43 -06:00
LetterJay
e9e068dc7c Merge pull request #4759 from Citadel-Station-13/upstream-merge-34252
[MIRROR] Fixes secbot sprites
2018-01-11 15:17:33 -06:00
LetterJay
fe6fb09ce7 Merge pull request #4758 from Citadel-Station-13/upstream-merge-34189
[MIRROR] CHECK_TICK & logging for cmd_admin_areatest
2018-01-11 15:17:24 -06:00
LetterJay
878b16e41a Merge pull request #4757 from Citadel-Station-13/upstream-merge-34177
[MIRROR] Prevents renaming uniquely named pets.
2018-01-11 15:16:38 -06:00
LetterJay
76c423e65d Merge pull request #4756 from Citadel-Station-13/upstream-merge-34168
[MIRROR] Corrects runtime when shooting humans
2018-01-11 15:16:16 -06:00
CitadelStationBot
36def519b2 Automatic changelog generation for PR #4755 [ci skip] 2018-01-11 15:16:07 -06:00
LetterJay
2e6891f0c2 Merge pull request #4755 from Citadel-Station-13/upstream-merge-34242
[MIRROR] Precision in timekeeping is important, okay.
2018-01-11 15:16:05 -06:00
CitadelStationBot
6a32cf0b22 Automatic changelog generation for PR #4754 [ci skip] 2018-01-11 15:15:56 -06:00
LetterJay
36a5b861f6 Merge pull request #4754 from Citadel-Station-13/upstream-merge-34216
[MIRROR] Adds Display Name Argument to Techweb Logging
2018-01-11 15:15:54 -06:00
CitadelStationBot
b046e615c8 Automatic changelog generation for PR #4752 [ci skip] 2018-01-11 15:15:31 -06:00
LetterJay
9f9550d5ba Merge pull request #4752 from Citadel-Station-13/upstream-merge-34249
[MIRROR] Replace CentComm with CentCom
2018-01-11 15:15:28 -06:00
CitadelStationBot
97445bb634 Automatic changelog generation for PR #4751 [ci skip] 2018-01-11 15:15:10 -06:00
LetterJay
1948b055a4 Merge pull request #4751 from Citadel-Station-13/upstream-merge-34248
[MIRROR] removes the "and clear buffer" text on eject button
2018-01-11 15:15:06 -06:00
LetterJay
387f8b973d Merge pull request #4750 from Citadel-Station-13/upstream-merge-34253
[MIRROR] Fixes potato cells missing wires
2018-01-11 15:14:48 -06:00
LetterJay
25d231fc20 Merge pull request #4749 from Citadel-Station-13/upstream-merge-34223
[MIRROR] Stops the dbadmin warning if SQL_ENABLED isnt set
2018-01-11 15:14:32 -06:00
LetterJay
92e8f3cefc Merge pull request #4748 from Citadel-Station-13/upstream-merge-34222
[MIRROR] Fixes error if next_map.json is missing
2018-01-11 15:14:19 -06:00
LetterJay
7c0944560a Merge pull request #4745 from Citadel-Station-13/upstream-merge-34254
[MIRROR] Fixes beams failing to qdel properly. Maybe.
2018-01-11 15:12:11 -06:00
CitadelStationBot
ef83d5d834 Removes omnizine (traitor) cigarettes from captain's office on Meta 2018-01-11 14:05:06 -06:00
oranges
8b4788a884 Merge pull request #34101 from ShizCalev/got-a-light-
Removes omnizine (traitor) cigarettes from captain's office on Meta
2018-01-11 14:05:06 -06:00
CitadelStationBot
49e1ad5128 [READY]Pulling claw 2 2018-01-11 14:03:53 -06:00
arsserpentarium
1d91243ae2 [READY]Pulling claw 2 (#33817)
Pulling claw is integrated circuit,which allows drones to pull things.
2018-01-11 14:03:52 -06:00
CitadelStationBot
6511c6bb58 Fixes twohanded weapons not unwielding when you lose an arm. 2018-01-11 14:02:42 -06:00
oranges
6dfb1e2351 Merge pull request #34206 from ShizCalev/fireaxe-drop
Fixes twohanded weapons not unwielding when you lose an arm.
2018-01-11 14:02:42 -06:00
CitadelStationBot
50ddb25f5f improves chem macro feedback 2018-01-11 14:02:35 -06:00
oranges
d8f232bd07 Merge pull request #34204 from ShizCalev/chem-macro-feedback
improves chem macro feedback
2018-01-11 14:02:35 -06:00
CitadelStationBot
3e87c1f08b Fixes secbot sprites 2018-01-11 09:45:47 -06:00
Leo
47f361e67c Merge pull request #34252 from ShizCalev/beepsky-sprite-fix
Fixes secbot sprites
2018-01-11 09:45:47 -06:00
CitadelStationBot
8674c28030 CHECK_TICK & logging for cmd_admin_areatest 2018-01-11 07:40:41 -06:00
Leo
337ed7f0a6 Merge pull request #34189 from ShizCalev/test-area-tick
CHECK_TICK & logging for cmd_admin_areatest
2018-01-11 07:40:41 -06:00
CitadelStationBot
585e8aa75c Prevents renaming uniquely named pets. 2018-01-11 07:40:33 -06:00
Leo
5cb74c909c Merge pull request #34177 from ShizCalev/pet-rename
Prevents renaming uniquely named pets.
2018-01-11 07:40:33 -06:00
CitadelStationBot
218a823ac3 Corrects runtime when shooting humans 2018-01-11 07:40:26 -06:00
Leo
bc7b34d369 Merge pull request #34168 from ShizCalev/dna-human-runtime
Corrects runtime when shooting humans
2018-01-11 07:40:26 -06:00
CitadelStationBot
06f44b1764 Precision in timekeeping is important, okay. 2018-01-11 07:40:19 -06:00
Leo
7efa8098fa Merge pull request #34242 from Someguynamedpie/patch-1
Precision in timekeeping is important, okay.
2018-01-11 07:40:19 -06:00
CitadelStationBot
8c73c05fee Adds Display Name Argument to Techweb Logging 2018-01-11 07:40:11 -06:00
ExcessiveUseOfCobblestone
af4f017b93 Adds Display Name Argument to Techweb Logging (#34216)
* Update _techweb.dm

* Replaces ID with the name of the tech web

* REVERT ON THE WEBBITOR

* Webbitor Blues

* removes "
2018-01-11 07:40:11 -06:00
CitadelStationBot
3515822f81 Replace CentComm with CentCom 2018-01-11 07:39:52 -06:00
Tad Hardesty
149542ca26 Replace CentComm with CentCom in deadchat message (#34249) 2018-01-11 07:39:52 -06:00
yorii
6a485fa8df removes the "and clear buffer" text on eject button 2018-01-11 07:39:45 -06:00
CitadelStationBot
97eba5fd5d Fixes potato cells missing wires 2018-01-11 07:39:37 -06:00
AnturK
d44d3c3f26 Fixes potato cells missing wires (#34253) 2018-01-11 07:39:37 -06:00
CitadelStationBot
534c8e9d8f Stops the dbadmin warning if SQL_ENABLED isnt set 2018-01-11 07:39:29 -06:00
Jordan Brown
ab71f0293b Stops the dbadmin warning if SQL_ENABLED isnt set (#34223) 2018-01-11 07:39:29 -06:00
CitadelStationBot
c5730fd79e Fixes error if next_map.json is missing 2018-01-11 07:39:22 -06:00