Commit Graph

17495 Commits

Author SHA1 Message Date
Incoming5643
424d450dbc Makes the "nothing happened!" option of drake's blood vaguely more entertaining/frustrating (#20144)
* Makes the "nothing happened!" option of drake's blood vaguely more entertaining by turning those who hit it into a lizardperson approximating the appearance of an ash drake.

* changed the colors to a suggestion of @ChangelingRain
2016-08-27 16:55:59 -05:00
Core0verload
3b188fd41f One Liner Fix (#20098) 2016-08-27 10:34:22 -05:00
Iamgoofball
f04ccfddea [s] I give up and rename it to what it actually does (#20148)
* [s] stops bans

* My Immortal, the entire Baneposting script, Bee Movie, Inside Out script, and then WGW for good measure in a commit message
2016-08-27 00:32:20 -05:00
Jordie
f9c3492e6e Merge pull request #20103 from Shadowlight213/radstormfixes
A couple of radstorm fixes.
2016-08-27 13:47:49 +10:00
Joan Lung
61cd5ab291 Merge pull request #20096 from Jalleo/Processor
Resolves the code for food processors and slime processors + minor fixes
2016-08-26 10:18:50 -04:00
blah
9471623237 Does the change that Joan requested 2016-08-26 15:11:14 +01:00
Kyle Spier-Swenson
26f293a296 [s]fixes qdel lag from computers in chasms (#20127)
* fixes qdel lag from computers in chasms

* Update computer.dm
2016-08-26 18:59:43 +12:00
Shadowlight213
3ff6886189 Fixes infinite stun and collapse spam 2016-08-25 21:58:23 -07:00
Leo
17ecd06950 Changes the ash drake armour on crafting recipe to match the actual item (#20122) 2016-08-25 23:56:32 -05:00
Supermichael777
2c37920f60 Adds a discription for triple citrus (#20090)
* Adds a discription for triple citrus

along with a placeholder sprite

* Add files via upload

* Add files via upload

* need to replace

* with thiss

* and implment
2016-08-26 14:13:25 +12:00
Joan Lung
52ba13fbdf Remove xenobio's free antag (#20081) 2016-08-26 14:12:29 +12:00
PKPenguin321
11a500d3b7 makes people get hurt when thrown at each other (#20084)
* makes people get hurt when thrown at each other

* why the space indeed
2016-08-26 14:12:06 +12:00
Joan Lung
5188bc7a69 Fixes AI bumping (#20077) 2016-08-26 14:11:20 +12:00
Shadowlight213
04e38f424a Fixes temp gun not starting with a pin (#20094) 2016-08-25 19:06:46 -05:00
ma44
420f83f14d Update hydroitemdefines.dm (#20101) 2016-08-25 18:26:38 -05:00
KorPhaeron
459ab8d949 Mapping object to help set baseturfs (#19962)
* Mapping Helper

* Minor fix
2016-08-26 09:01:12 +12:00
kilkun
d65ef9100f Minor modernization of nanotrasen death commandos (#20057)
* First round of deathsquad related changes

* fixes directory error for shielded hardsuit helmet
2016-08-26 08:50:16 +12:00
oranges
722cd0fc44 Merge pull request #20065 from Shadowlight213/ircsay
Adds adds the ability to get a list of admins and their status from irc.
2016-08-26 08:49:50 +12:00
Incoming5643
1993b8d7ca [s] Adds the top secret room to centcom (#20071)
* Adds the top secret room to centcom, the final destination of players who manage to cosign themselves to nullspace.

Said room is an homage to a room that served a similar purpose in the legend of zelda.

* Follow up issues pull:
for loop optimization
game logging
spelling errors

* more info for admin message
2016-08-26 08:46:52 +12:00
Core0verload
463e86af39 Revert "Removes the NULL Crate" (#20076) 2016-08-26 08:45:31 +12:00
blah
308603ca61 Properly fixes the blood bucket and fixes being able to manually put in slimes and monkeys. 2016-08-25 16:23:47 +01:00
blah
4b1b1b1dbe Fixes bucket of blood. 2016-08-25 15:26:26 +01:00
blah
d01bba7481 Solves a issue I created and a needless comment 2016-08-25 15:10:46 +01:00
blah
566234a83e Puts the code in to fix the consistency issue of food processors and slime processor. Someone else can edit the maps. 2016-08-25 12:48:24 +01:00
Core0verload
91e5b35707 Modular PCs rewrite (#20003)
* Modular computers rework, part A

* tweaks&fixes

* Adds component-side compatibility checks

* Moves computers to SSobj

* Fixes stationary computers not using power usage vars

* Changes icon generation a bit, adds icons to broken computers

* Moves UI into it's own file

* Laptop refactor + sprite replacement

* Modular console's keyboard now lights up when powered

* minor fixes

* fixes

* bonus: wired connector, new type of recharger

* Modular computers are now devices

* code quality ocd
2016-08-25 10:28:33 +12:00
oranges
6a66ba65db Merge pull request #19924 from Shadowlight213/Readstorm
Changes radiation storm random event into a weather type.
2016-08-25 10:28:23 +12:00
oranges
427cebe38c Merge pull request #20031 from MrStonedOne/hey!listen!
Client windows will now flash in the taskbar on incoming adminhelp/adminpm
2016-08-25 10:27:14 +12:00
Cheridan
5defa30696 Merge pull request #20062 from ChangelingRain/takepainstohurtnobodywhereyoucanwhereyourmerepresenceisapainleavewhereyourwordsaredaggerscloseyourmouthwhereyoursightisarakinglashcloseyoureyes
Adds several KA mods and allows mining borgs to install any KA mods
2016-08-24 13:26:54 -05:00
Joan Lung
fd8def8c26 Merge pull request #20058 from MrStonedOne/patch-244
[s]I'll build my own cid randomizer detector! with blackjack! and hookers!
2016-08-24 11:46:35 -04:00
MrStonedOne
3e6dd6a41d Better Admin name for the notes. 2016-08-23 21:26:35 -07:00
Joan Lung
8bf7011ab6 Using a resonator on an existing resonator field will immediately detonate that field (#20001)
* Using a resonator on an existing resonator field will immediately detonate that field

* field updates

* late night code

* buff
2016-08-24 16:08:28 +12:00
oranges
169c9f3d04 Merge pull request #20028 from Shadowlight213/powerfailure
Adds the grid check random event from baystation.
2016-08-24 16:06:49 +12:00
Cheridan
c68ef5909d Merge pull request #20045 from TechnoAlchemisto/dads_coma_was_the_best_thing_to_ever_happen_to_this_family
Places mining scanners above mining satchels in miner lockers. Also minor sprite changes
2016-08-23 23:02:01 -05:00
Joan Lung
8667275dd9 Merge pull request #20052 from PKPenguin321/alien-queen-giga-toggle
[READY!] Adds alien queen sprite toggle
2016-08-23 23:01:15 -04:00
Cheridan
2eecae0e18 Merge pull request #20048 from Iamgoofball/patch-111
Removes the NULL Crate
2016-08-23 19:30:43 -05:00
NikNakFlak
fab4bcfeab Merge remote-tracking branch 'upstream/master' into makelife
Conflicts:
	code/modules/hydroponics/grown/citrus.dm
2016-08-23 17:08:36 -07:00
PKPenguin321
11b06f1b09 hopefully final commit 2016-08-23 17:01:24 -07:00
NikNakFlak
d9ddba9361 Fixes a copypasta error 2016-08-23 16:59:10 -07:00
PKPenguin321
bcc030be17 finally makes the button work 2016-08-23 16:10:39 -07:00
Kyle Spier-Swenson
f154ede75b Cid randomizer dll detector.
When a user's cid doesn't match their last cid, we just close the connection, faking a read error. If it's still mismatched when they reconnect, we reject the connection and let them know we are on to them.
2016-08-23 13:20:17 -07:00
Joan Lung
80dab4b752 rely on humans 2016-08-23 15:53:17 -04:00
Joan Lung
d955dacefd hit modkits 2016-08-23 15:51:38 -04:00
Shadowlight213
b77e232ab9 Adds adds the ability to get a list of admins and their status from irc.
also fixes the ircstatus command
2016-08-23 12:43:51 -07:00
Joan Lung
54c1d0ef35 MODS MODS MODS GET EM NOW 2016-08-23 15:26:19 -04:00
Cheridan
bf5b5bd380 Merge pull request #20030 from MrStonedOne/erroinchargeoflights
Removes unneeded lighting checks.
2016-08-23 10:35:44 -05:00
Joan Lung
7355d91718 Adds a damage AoE KA mod 2016-08-23 10:37:20 -04:00
oranges
395d11101b Merge pull request #20023 from Shadowlight213/implantstuffs
Makes nutriment and reviver implants way easier to get
2016-08-23 17:26:19 +12:00
GunHog
d8f31dbb55 Aux Mining Base Tweaks (#20015)
* Aux Mining Base Tweaks

- Multiple landing zones may now be set for the mining base.
- The coordinates of each landing zone is shown in the list.
- Miners now each get a remote in their starting lockers.
- The Aux mining base now requires lighting while on station
- The Aux Mining Base now has a GPS signal.

* More tweaks

- The shuttle landing beacon no longer requires line of sight, just a
distance check.
- Beacon now has a description.
- Landing site name updated
- Adds support for stat logging base drops.

* Mining Shuttle Interface

- The aux base can now interface with the mining shuttle once the
shuttle beacon is deployed near the base.
- Updated descriptions to explain this.

* Launch Warning

Keeps the launch warning without it going off each time it is used to
move the mining shuttle.
2016-08-23 17:25:01 +12:00
oranges
03317708ec Merge pull request #20024 from Shadowlight213/enoughisenoughistoomuch
Makes runtime's family persistence only work on kittens
2016-08-23 17:22:40 +12:00
Shadowlight213
7e09f1bc77 Removes SMES power failure.
changes exception system to use critical_machine variable on machines.
Tcomms machines and the AI have their areas exempted.
If the PA is assembled, engineering is exempted.
2016-08-22 19:24:59 -07:00