304d91fa2c
Merge pull request #11606 from Firecage/gunnames
...
This gives most projectile guns less generic names.
2015-09-09 10:45:18 -05:00
b7cbf7f940
Just a name change to uplink items.
2015-09-09 17:38:22 +02:00
42a28af718
Updated gun names.
2015-09-07 10:06:14 +02:00
c5984f4359
Merge branch 'master' of https://github.com/tgstation/-tg-station into legitposters
...
Conflicts:
_maps/map_files/MetaStation/MetaStation.v41G.dmm
2015-09-06 13:27:51 -04:00
9c341fb128
This gives most projectile guns less generic names.
2015-09-06 13:43:38 +02:00
73c3e0e4f9
Merge pull request #11536 from Incoming5643/letting_old_threats_lay_fallow
...
Reverts #10922 : ei nath nerfs 2: ayy lmao
2015-09-04 22:52:15 -05:00
261494e659
Made some changes and repathing for posters.
2015-09-04 18:30:58 -04:00
df7386a4ec
Assemblies update
2015-09-04 11:22:37 +03:00
fcaad005de
Reverts #10922 : ei nath nerfs 2: ayy lmao
...
1. Someone gets salty and tries to grudgecode ei nath away
2. Someone else has to step in and make a nerf that isn't shooting the spell in the knees
3. The salt does not abate and new grudgecode rises
4. Everyone laughs about it and forgets about the pull
5. Months later it gets pulled with no testing and outstanding grammatical errors to the surprise of everyone, including the person who originally grudgecoded it
This is duuuuuuuumb
2015-09-02 00:26:42 -04:00
00f01159b1
Fixes Merge conflicts
2015-09-01 19:46:30 -07:00
75b2f53ce8
Merge remote-tracking branch 'upstream/master' into crawlinginmyskin
...
Conflicts:
icons/mob/actions.dmi
2015-09-01 15:39:15 +01:00
bfbe4e997e
Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE
...
Makes all Destroy() procs return properly
2015-09-01 15:54:18 +03:00
e69d8d312b
Merge pull request #11232 from Miauw62/alanedaggerpoe
...
Edaggers: Actually works edition
2015-09-01 11:07:22 +03:00
a898794ed1
Merge pull request #10922 from Miauw62/idedthenerfening
...
ei nath nerfs 2: ayy lmao
2015-09-01 10:34:54 +03:00
4a4d46305f
Merge pull request #11485 from AnturK/knockknock
...
Makes knock spell open lockers/crates
2015-09-01 09:52:02 +03:00
48b67e5a25
Merge branch 'master' of https://github.com/tgstation/-tg-station into returnQDEL_HINT_LETMEDIE
...
Conflicts:
code/game/objects/effects/landmarks.dm
2015-09-01 00:11:33 -06:00
4644e99aa7
Changed bloodcrawl to be a spell.
...
Changed blood crawl to be a spell.
BLOOOOD
2015-08-31 16:24:27 +01:00
608f216b40
Merge pull request #11469 from Cheridan/crushed_it
...
Recycler Tweak Port
2015-08-31 10:07:31 +03:00
51c09f16bf
makes all Destroy()'s return properly
2015-08-31 00:21:01 -06:00
877111b8e6
Removed upgrade mechanics from camera bugs. They come build in with networking, sabotage, and tracking upgrades. Also added camera disable button to track menu.
2015-08-30 17:58:27 -07:00
d1c417e996
Merge pull request #11416 from xxalpha/airlockQDEL
...
Added qdel(wires) to a bunch of objects Destroy proc.
2015-08-31 00:08:27 +03:00
32d74ad19c
Merge pull request #11433 from Core0verload/framed
...
Buttons and wall frames rework
2015-08-30 13:43:19 -05:00
31aab1ed56
makes knock open lockers/crates
2015-08-30 17:38:01 +02:00
97b792bbc3
Changed some circuits paths to reduce copypasta
2015-08-30 16:58:13 +03:00
c4a1b0ebdb
Recycler Tweak Port
2015-08-29 17:47:42 -05:00
19947d4fa0
Added qdel(wires) to a bunch of objects Destroy proc.
...
Return ..()
2015-08-27 11:10:58 +01:00
6c40da4c11
Fixes the message of losing the phylactery on the bind to object spell, now it actually shows up.
2015-08-24 04:46:48 -03:00
20e57adf89
Added salt shaker and pepper mill to food crate
2015-08-19 15:16:12 +01:00
825b5794c7
Merge pull request #11239 from Firecage/del2qdel
...
del() to qdel()
2015-08-19 11:50:24 +02:00
9266964f62
Merge pull request #11108 from bgobandit/newcrates
...
Adds forensics and toy crates to cargo.
2015-08-19 19:24:15 +10:00
8c9c59239f
Merge pull request #11168 from oisin100/patch-1
...
Bugfix And Feature addition. Chameleon And Stealth Mutations
2015-08-19 19:04:55 +10:00
166818a67b
Changed String to Definition
2015-08-18 23:53:01 +02:00
0c4f4ccf1e
Merge pull request #11240 from CorruptComputer/thisandthat
...
Deletes computerfiles.dm and minor edit to atoms.dm
2015-08-18 20:36:32 +01:00
c19f72123c
Merge pull request #11227 from phil235/EpilepsyFix
...
Fixes epilepsy mutation leaving you always at super high jitteriness level.
2015-08-18 20:31:23 +01:00
ea84d4f3ce
Merge pull request #11207 from SconesC/belts
...
Adds Military Belts to the standard Uplink
2015-08-18 20:27:58 +01:00
14b3dcbd65
deletes computerfiles.dm and minor edit to atoms.dm
2015-08-16 16:53:33 -05:00
bf13763e3b
Merge branch 'master' of https://github.com/tgstation/-tg-station.git into del2qdel
2015-08-16 23:34:03 +02:00
dfae1e0b53
Changes a lot of del() to qdel()
2015-08-16 23:33:22 +02:00
f64f1e2967
Reverts the revert properly instead of unreverting it unproperly.
2015-08-16 12:55:09 +02:00
5539689f3a
Merge pull request #11043 from KorPhaeron/moreweebshit
...
Timestop for Wizards
2015-08-16 11:04:47 +02:00
8a4f8a4482
Revert "Adds 15-force edaggers that look and function like pens when off."
2015-08-16 00:36:08 +02:00
dacf037cda
Fixes epilepsy mutation leaving you always at super high jitteriness level. The jitteriness goes way down after the epileptic seizure ends (similar to door shocking jitter).
2015-08-15 23:17:46 +02:00
df758d2fff
Merge pull request #11146 from MMMiracles/biomemes
...
Revamps Bioterror Darts
2015-08-15 22:47:00 +02:00
907031df61
Merge pull request #11202 from Miauw62/alanedaggerpoe
...
Adds 15-force edaggers that look and function like pens when off.
2015-08-15 16:16:30 +02:00
024c71553a
Reduces price to 3 TC
2015-08-14 15:32:07 -07:00
138610b2a9
Belts into the Uplink
2015-08-14 15:23:30 -07:00
cb7bf7053b
Merge pull request #10923 from Miauw62/neonewling
...
upgrades changeling disguises
2015-08-15 00:03:06 +02:00
37dc7e0e3c
Adds 15-force edaggers that look and function like pens when off.
2015-08-14 14:07:10 +02:00
46b519309e
Merge pull request #11058 from Core0verload/surgery-organs-part2
...
Surgery & Organs rework: Phase 2
2015-08-13 18:04:16 +02:00
8859801ef2
Merge branch 'master' of https://github.com/tgstation/-tg-station into neonewling
...
Conflicts:
code/game/gamemodes/changeling/powers/humanform.dm
2015-08-13 12:14:52 +02:00
Cheridan
Firecage
bgobandit
c0
Incoming
palpatine213
xxalpha
Razharas
duncathan
AnturK
Cheridan
Aranclanos
erwgd
Swag McYolosteinen
Jordie
Oisin100
Remie Richards
CorruptComputer
phil235
phil235
SconesC