Commit Graph

32 Commits

Author SHA1 Message Date
Trilbyspaceclone be568777d2 [Ready] Buffs RPEDs (#7853)
* Buffs RPEDs

* maybe
2018-12-31 03:10:47 -08:00
Trilbyspaceclone 61659a5bac Buffs RPE and nerfs BSRPEs (#7766)
* Buffs RPE and nerfs BSRPEs

* half way
2018-11-29 22:50:16 -08:00
Poojawa b6430559e9 datums 2018-09-11 02:49:41 -05:00
deathride58 c8a3f56af6 Merge pull request #7489 from Citadel-Station-13/nanites
Nanites port
2018-09-03 13:47:28 -04:00
kevinz000 b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
kevinz000 279bbea738 Update bag_of_holding.dm 2018-08-21 11:54:44 -07:00
deathride58 3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58 ac6fddcfb3 Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync 2018-07-05 00:17:44 -04:00
CitadelStationBot 06d08c67c3 [MIRROR] Makes tear in the fabric of reality inaccessible until a boh bomb is detonated (#7327)
* Makes tear in the fabric of reality inaccessible until a boh bomb is detonated (#38852)

* a commit message

* reviews addressed?

* Makes tear in the fabric of reality inaccessible until a boh bomb is detonated
2018-07-04 18:38:53 -07:00
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
kevinz000 8b1917f149 Update bag_of_holding.dm 2018-06-27 01:38:36 -07:00
CitadelStationBot 0ab6db65a7 [MIRROR] BoH bombs now forcefully stun anyone flying when they go off (#7100)
* BoH bombs now forcefully stun anyone flying when they go off (#38397)

* Update bag_of_holding.dm

* Incorrect type.

* BoH bombs now forcefully stun anyone flying when they go off
2018-06-13 19:44:43 -07:00
oranges 4f379bb0d0 Merge pull request #38376 from AutomaticFrenzy/patch/lockbox
[s] Fix lockboxes not actually being locked
2018-06-11 22:30:08 -05:00
ShizCalev 4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
deathride58 2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
CitadelStationBot 5909c7c639 [MIRROR] Changes default button for BoH confirmation prompt (#6811)
* Changes default button for BoH confirmation prompt

* Update bag_of_holding.dm
2018-05-27 17:25:58 -07:00
Tad Hardesty 9b4b9b4f34 Refresh mob views when atoms enter/exit storage (#37954) 2018-05-21 04:46:20 -05:00
kevinz000 3819a5a9b5 Fixes EMPs (#37656) 2018-05-10 01:33:25 -05:00
kevinz000 4a7fae664e Fixes mousetraps not going off from being dumped out (#37447)
* mousetrap fix

* fix mousetraps

* Update storage.dm

* Combine checks
2018-05-04 04:43:12 -05:00
deathride58 55566461c6 Merge pull request #6601 from Citadel-Station-13/upstream-merge-37565
[MIRROR] Modifies component transfer to make ChangeTurf able to transfer components
2018-05-02 13:59:14 +00:00
deathride58 613fadf057 Update _concrete.dm 2018-05-01 21:27:01 -04:00
deathride58 e8f4602716 Update implant.dm 2018-05-01 21:16:05 -04:00
Tad Hardesty 34321883cc Fix placing boxes in storage implants 2018-05-01 07:30:07 -05:00
Jordan Brown 1675490652 Modifies component transfer to make ChangeTurf able to transfer components 2018-04-30 21:16:48 -05:00
kevinz000 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
deathride58 6f13d2c2e9 Merge pull request #6546 from Citadel-Station-13/upstream-merge-37380
[MIRROR] Refactors and fixes RPEDs
2018-04-29 22:45:28 +00:00
kevinz000 fe8e1cd61c [syou can no longer insert a storage object into itself, and therefore, no longer bohbomb with one boh (#37410)
* paradox

* fine, byond.

* src.
2018-04-29 15:21:02 -05:00
LetterJay ab8355968c Update rped.dm 2018-04-29 02:28:43 -05:00
Dax Dupont 4850230fc4 Refactors and fixes RPEDs 2018-04-27 13:13:37 -05:00
deathride58 634e896e11 Merge branch 'master' into upstream-merge-37299 2018-04-27 09:22:31 +00:00
Jordan Brown 1cdea15616 Fixes ghosts being unable to see into nonadjacent bags 2018-04-23 09:03:27 -05:00
Poojawa e5f9765d2a datums/controller stuff 2018-04-23 00:02:42 -05:00