Commit Graph

3658 Commits

Author SHA1 Message Date
Jordan Brown
fe1d69c35d IRC message if client mob ends up in nullspace (#33004)
Only if no admins are online
2017-11-24 12:59:54 -06:00
deathride58
d5d89a57b4 Update stock_parts.dm 2017-11-23 23:50:25 -05:00
ACCount
2147c60b7f Replaces "console screen" stock part with glass sheets 2017-11-23 18:53:47 -06:00
deathride58
c76cacdf77 Merge pull request #4081 from Citadel-Station-13/upstream-merge-32914
[MIRROR] [READY]NTnet refactor, assimilates exonet
2017-11-23 01:40:54 +00:00
deathride58
d5a8e2f13b Update telecomms_designs.dm 2017-11-22 20:10:41 -05:00
deathride58
cf01fa79db Merge pull request #4078 from Citadel-Station-13/upstream-merge-32801
[MIRROR] Adds ip and cid to banning panel ban search
2017-11-23 01:04:20 +00:00
deathride58
ad3608caeb Merge pull request #4075 from Citadel-Station-13/upstream-merge-32699
[MIRROR] Fixes hostile mobs attacking surrounding tiles when trying to attack someone: the stunning finale
2017-11-23 01:03:38 +00:00
LetterJay
eba36e48f9 Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
deathride58
c97e8805f6 Update hostile.dm 2017-11-22 17:53:36 -05:00
oranges
c2c22d56c7 [READY]NTnet refactor, assimilates exonet 2017-11-22 15:52:54 -06:00
Jordie
31b9828285 Adds ip and cid to banning panel ban search (#32801)
For kevinz000 because he managed to lose a ban and couldn't find it with ckey or ackey somehow.

No indexes because ORDER BY indexing is too finicky and having something like 8 indexes just for this wouldn't be worth the slowdown.
2017-11-22 15:38:07 -06:00
oranges
7c1fe79635 Merge pull request #32943 from ShizCalev/alium-softcrit-sprite
Fixes aliums showing wrong sprite in softcrit
2017-11-22 15:37:57 -06:00
GupGup
8458dc952c Fixes hostile mobs attacking surrounding tiles when trying to attack someone: the stunning finale 2017-11-22 15:24:21 -06:00
deathride58
2e9f3bc1c0 Merge pull request #4071 from Citadel-Station-13/upstream-merge-32968
[MIRROR] Fixes bartender suit having an adjust state
2017-11-22 20:50:45 +00:00
deathride58
bf6f920754 Merge pull request #4059 from Citadel-Station-13/upstream-merge-32944
[MIRROR] Update Turbine computer to use TGUI
2017-11-22 20:49:58 +00:00
deathride58
5e43516925 Merge pull request #4060 from Citadel-Station-13/upstream-merge-32955
[MIRROR] Gives the R&D Server a description and makes its name improper
2017-11-22 19:57:19 +00:00
deathride58
3b1067ba7a Update pants.dm 2017-11-22 14:56:26 -05:00
deathride58
c5adadc5d1 Update engineering.dm 2017-11-22 14:54:01 -05:00
deathride58
5d2c5add1f Update color.dm 2017-11-22 14:50:37 -05:00
deathride58
b24c9335b3 Update jobs.dm 2017-11-22 14:48:35 -05:00
deathride58
5e6e725666 Update color.dm 2017-11-22 14:47:15 -05:00
deathride58
2dbe3e3b82 Update chameleon.dm 2017-11-22 14:46:06 -05:00
deathride58
7bc195c055 Merge pull request #4069 from Citadel-Station-13/upstream-merge-32970
[MIRROR] `ahelp` command can now accept a ticket #
2017-11-22 19:42:02 +00:00
deathride58
889defd2ce Update _event.dm 2017-11-22 14:29:13 -05:00
deathride58
b925c0e265 Update server.dm 2017-11-22 14:20:45 -05:00
ShizCalev
6ab499b57b Fixes bartender suit having an adjust state 2017-11-22 12:40:32 -06:00
Jordan Brown
5468bcc56f ahelp command can now accept a ticket # (#32970)
* `ahelp` command can now accept a ticket #

As opposed to only a ckey

* Fix bad invocation of TicketByID()

* Use correct ahelp typepath
2017-11-22 12:38:07 -06:00
Tad Hardesty
38c45fb479 Refactor chasm paths to be more sane (#32701)
In addition, makes chasm handling a component, so it could be reused for
chasm-likes which are not quite chasms.

Also fixes a couple of bugs relating to building on top of chasms
occasionally erasing the chasm.
2017-11-22 03:30:49 -06:00
jammer312
cf10130b21 Conjuration spells fix (#32951)
* conjure spells fix

* added newline at end of file
2017-11-21 22:30:05 -06:00
Y0SH1M4S73R
61ae95da33 Gives the R&D Server a description and makes its name improper 2017-11-21 22:28:23 -06:00
Matt Smith
694958f587 Update Turbine computer to use TGUI 2017-11-21 22:28:14 -06:00
deathride58
0f9a85e4d7 Merge pull request #3747 from Citadel-Station-13/upstream-merge-32101
[MIRROR] Refactor of catpeople mutant organs
2017-11-21 21:16:31 +00:00
deathride58
aedf16a76e merges #4011 2017-11-21 15:07:31 -05:00
deathride58
51a7c4a543 Merge pull request #4057 from deathride58/manualmirrors2
Manually mirrors #32838 and #32462 from upstream
2017-11-21 20:00:18 +00:00
deathride58
4b284f2e0d Merge pull request #4051 from Citadel-Station-13/upstream-merge-32773
[MIRROR] Integrated circuit fixes and code improvements
2017-11-21 19:59:38 +00:00
deathride58
1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
deathride58
c2b27ebfa4 merges #3837 2017-11-21 14:45:44 -05:00
deathride58
9f80325c52 Update power.dm 2017-11-21 14:20:03 -05:00
deathride58
e5cdbe29cc Update printer.dm 2017-11-21 14:18:42 -05:00
deathride58
ddbb5c34d4 manual mirrors 2017-11-21 14:06:28 -05:00
Leo
f668f36156 Merge pull request #32928 from ShizCalev/space-leg-slowdown
Fixes humans missing legs moving slower in zero-g enviroments
2017-11-21 04:01:56 -06:00
ACCount
8a64287249 Integrated circuit fixes and code improvements 2017-11-21 03:04:17 -06:00
deathride58
2abd06e25e Merge pull request #4028 from Citadel-Station-13/upstream-merge-32862
[MIRROR] Rat Kebabs
2017-11-21 04:39:41 +00:00
deathride58
d2b251d23c Merge pull request #4041 from Citadel-Station-13/upstream-merge-32844
[MIRROR] Cleans up unused code
2017-11-21 04:15:11 +00:00
deathride58
0ed8bf3237 Update security_levels.dm 2017-11-20 22:33:12 -05:00
deathride58
3b0a71006c Update experimentor.dm 2017-11-20 22:32:20 -05:00
deathride58
15165d970d Update inventory.dm 2017-11-20 22:29:55 -05:00
deathride58
3aefa4a907 Update cameranet.dm 2017-11-20 22:29:15 -05:00
deathride58
6b8d256c21 Merge pull request #4030 from Citadel-Station-13/upstream-merge-32885
[MIRROR] tweak skateboard crashes, gives brain damage
2017-11-21 03:27:16 +00:00
deathride58
b284385b20 Merge pull request #4042 from Citadel-Station-13/upstream-merge-32908
[MIRROR] Fixes the RD being able to kill the bar drone with his console
2017-11-21 03:26:26 +00:00