Zuhayr
b9fcd34df3
Merged config and changelog.
2013-12-22 23:11:29 +10:30
RavingManiac
751219dbfd
Added "hide" verb to mousetraps, placing them on the same layer as hidden mice.
...
Triggered mousetraps and dead mice will be moved back to the top layer.
Monkeys will no longer move randomly while being pulled.
2013-12-18 02:08:38 +08:00
Mloc-Argent
b175c6906b
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
...
Conflicts:
html/changelog.html
2013-12-13 19:13:43 +00:00
Ccomp5950
4a8e7d9b04
Changelog fix, putting Yinadale's stuff up top.
...
Hopefully done in a manner in which there shouldn't be any conflicts.
2013-12-02 10:47:27 -06:00
Zuhayr
69d84931e6
Changelog merge resolution.
2013-12-03 01:07:17 +10:30
Zuhayr
e90fd95a22
Merge resolution.
2013-12-01 15:19:29 +10:30
Chinsky
027b0d8ec6
Merge branch 'master' into dev-freeze
...
Conflicts:
html/changelog.html
2013-11-30 05:16:49 +04:00
Chinsky
5d3e712d64
Merge branch 'master' into dev-freeze
...
Conflicts:
html/changelog.html
2013-11-30 05:11:36 +04:00
Zuhayr
d80edab619
Merge resolution. God damn the changelog.
2013-11-29 22:39:33 +10:30
Nanai
a9e8135040
Updated changelog.html
...
Swag changelog update.
2013-11-24 01:15:56 -05:00
Ccomp5950
e562119d21
Changelog update for Master (Ccomp5950)
...
Stuff I've worked on since.
2013-11-23 23:29:42 -06:00
Cael Aislinn
88c059eae6
changelog update
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2013-10-29 05:35:02 +10:00
Kilakk
97ddfc1007
Removed a silly duplicate entry in the changelog
2013-10-26 13:36:34 -04:00
Chinsky
29ea7f0d3a
Merge branch 'dev-freeze' into dev
...
Conflicts:
html/changelog.html
maps/tgstation2.dmm
2013-10-10 14:37:41 +04:00
Mloc-Argent
65f218ee63
Merge branch 'master' into dev-freeze
...
Conflicts:
code/ZAS/Fire.dm
html/changelog.html
maps/tgstation2.dmm
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-10-08 22:01:16 +01:00
Chinsky
9000854ddc
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into viro
2013-10-06 14:10:20 +04:00
Chinsky
35a09b5bfc
Changelog
2013-10-06 12:49:37 +04:00
Chinsky
e96c1906af
Changelog
2013-10-06 12:18:05 +04:00
Mloc
49c0a30301
Merge branch 'master' into dev
...
Conflicts:
baystation12.dme
html/changelog.html
2013-09-26 10:26:03 +01:00
DJSnapshot
c37a1a3b80
Updated Changelog
2013-09-24 23:45:32 -07:00
Kilakk
d48c2a844c
Changelog
2013-09-18 20:19:18 -04:00
Erthilo
3b61ba850f
Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
baystation12.dme
code/modules/projectiles/ammunition/bullets.dm
2013-09-02 23:32:33 +01:00
Mloc-Argent
51ea24b0fe
Genericify this shit.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-09-01 21:17:09 +01:00
Erthilo
547c1e670d
Adds janitorial cart from tg, replacing janicart. Adds in some NanoUI stuff to make it work.
2013-08-31 20:12:19 +01:00
Erthilo
d0c71c8dc2
Moved maptools to tool/mapmerge. Added midi2piano and AddToChangelog.
2013-08-31 19:10:02 +01:00
Giacomand
83718db6c2
* Added a changelog entry for the return of the AI announcements.
2013-08-26 07:39:43 +01:00
Zuhayr
375437a6cf
Changelog merge. I hate the changelog.
2013-08-12 11:20:41 -07:00
Erthilo
8d7e75e619
Changelog.
2013-08-11 21:35:29 +01:00
comma
e45f429e4c
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
maps/tgstation.2.1.0.0.1.dmm
2013-08-04 01:40:32 +04:00
comma
625eecddaa
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into pain
...
Conflicts:
html/changelog.html
2013-08-04 00:43:10 +04:00
comma
61812b9668
changelog.html
2013-08-04 00:15:03 +04:00
comma
80cc45bc6b
Changelog
2013-08-01 10:04:49 +04:00
Kilakk
ceb5facd76
Added Erthilo's commit to the changelog - whoops
2013-07-30 17:46:12 -04:00
Kilakk
7cd50d38a3
Committing changelog.
2013-07-30 17:41:03 -04:00
Erthilo
89ffc92168
Fixes text errors in ghost manifest runes and newscasters with apostrophes.
2013-07-30 22:36:42 +01:00
Erthilo
02f7e34f66
Changelog.
2013-07-30 20:43:02 +01:00
Segrain
41e9c591b3
Changelog.
2013-07-28 02:12:02 +03:00
Kilakk
1bb40348b1
Committing changelog
2013-07-26 14:32:33 -04:00
Mloc-Argent
8575b7a286
And once again, did that the wrong way around. Whoops.
...
Fully reverts #3316 .
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-20 18:41:50 +01:00
Mloc-Argent
adc3c14779
Revert #3316 from BEF due to compile errors and (assumed) missing files.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-20 18:38:00 +01:00
LordBraindead
f172e085b1
Update changelog.html
...
underped the changelog too
2013-07-14 21:40:32 +02:00
LordBraindead
08d2e22220
fire update
...
enabled fire to destroy floors and objects
also tweaked the behaviour of glass to enable glasslocks against fire
also made fire extingiushers stop being useless
2013-07-14 21:20:45 +02:00
comma
da35278439
Merge remote-tracking branch 'remotes/origin/bleeding-edge-freeze' into viro
...
Conflicts:
html/changelog.html
2013-07-11 02:53:58 +04:00
comma
aaa1228e11
Changelog.
2013-07-11 02:52:36 +04:00
comma
2509e8f836
Changelog entry.
2013-07-09 14:19:05 +04:00
Spamcat
1541b5dec8
Changelog.
2013-07-05 04:44:54 +04:00
Segrain
66265e2689
Recordskeeping update.
2013-07-03 05:55:18 +03:00
Whitellama
e49a80d822
Fixed changelog conflicts
2013-06-30 13:59:24 -07:00
Whitellama
9ec3996cf4
Updated changelog with space ninja gamemode changes
2013-06-26 17:30:32 -07:00
Segrain
ca635a37f3
Conflict fix. I hope.
2013-06-24 12:02:03 +03:00
